diff options
| author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-04-13 18:49:04 -0700 |
|---|---|---|
| committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-04-13 18:49:04 -0700 |
| commit | 84507c03f49092387b6c57129d350bc5c8463b40 (patch) | |
| tree | ad9dfb7e883b818b525db230bbecca71fc3bf0dc /spec/spec_helper.rb | |
| parent | 04c8e48311231d0b8332a7050a48defc9d7b075e (diff) | |
| parent | 968271f718929311797342e211f5ca29506463b9 (diff) | |
| download | rails-84507c03f49092387b6c57129d350bc5c8463b40.tar.gz rails-84507c03f49092387b6c57129d350bc5c8463b40.tar.bz2 rails-84507c03f49092387b6c57129d350bc5c8463b40.zip | |
Merge branch 'master' of git://github.com/brynary/arel into brynary/master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4b61ae8ca8..b633d17257 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,15 +6,9 @@ $LOAD_PATH.unshift "#{dir}/../lib" Dir["#{dir}/matchers/*"].each { |m| require "#{dir}/matchers/#{File.basename(m)}" } require 'active_relation' -ActiveRecord::Base.configurations = { - 'test' => { - :adapter => 'mysql', - :username => 'root', - :password => 'password', - :encoding => 'utf8', - :database => 'sql_algebra_test', - }, -} +FileUtils.cp("#{dir}/../config/database.yml.example", "#{dir}/../config/database.yml") unless File.exist?("#{dir}/../config/database.yml") + +ActiveRecord::Base.configurations = YAML::load(IO.read("#{dir}/../config/database.yml")) ActiveRecord::Base.establish_connection 'test' class Hash |