diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-25 16:38:49 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-25 16:38:49 -0800 |
| commit | c99d969160302a849cfb8d3d6d0604a50b86fadd (patch) | |
| tree | cf1f9cdacf5603c467eacc1f375ae23631bf7a92 | |
| parent | d80ad96b9526178c1474204b73f9fbde4cb7728f (diff) | |
| parent | 2409c61661f0b1c4f946a99c215cc4b4635c0cd6 (diff) | |
| download | rails-c99d969160302a849cfb8d3d6d0604a50b86fadd.tar.gz rails-c99d969160302a849cfb8d3d6d0604a50b86fadd.tar.bz2 rails-c99d969160302a849cfb8d3d6d0604a50b86fadd.zip | |
Merge pull request #13485 from schneems/schneems/fix-more-railties-tests
Partial fix of database url tests
| -rw-r--r-- | activerecord/test/cases/tasks/database_tasks_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/rake/dbs_test.rb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb index a9a114328c..3257b782a9 100644 --- a/activerecord/test/cases/tasks/database_tasks_test.rb +++ b/activerecord/test/cases/tasks/database_tasks_test.rb @@ -143,7 +143,7 @@ module ActiveRecord def test_establishes_connection_for_the_given_environment ActiveRecord::Tasks::DatabaseTasks.stubs(:create).returns true - ActiveRecord::Base.expects(:establish_connection).with('development') + ActiveRecord::Base.expects(:establish_connection).with(:development) ActiveRecord::Tasks::DatabaseTasks.create_current( ActiveSupport::StringInquirer.new('development') diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb index 9a36d1ca01..0f4f01df1b 100644 --- a/railties/test/application/rake/dbs_test.rb +++ b/railties/test/application/rake/dbs_test.rb @@ -20,9 +20,12 @@ module ApplicationTests end def set_database_url - ENV['DATABASE_URL'] = File.join("sqlite3://:@localhost", database_url_db_name) + ENV['RAILS_DATABASE_URL'] = File.join("sqlite3://:@localhost", database_url_db_name) # ensure it's using the DATABASE_URL FileUtils.rm_rf("#{app_path}/config/database.yml") + File.open("#{app_path}/config/database.yml", 'w') do |f| + f << {ENV['RAILS_ENV'] => %Q{<%= ENV['RAILS_DATABASE_URL'] %>}}.to_yaml + end end def expected @@ -126,7 +129,7 @@ module ApplicationTests bundle exec rake db:migrate db:structure:dump` structure_dump = File.read("db/structure.sql") assert_match(/CREATE TABLE \"books\"/, structure_dump) - `bundle exec rake db:drop db:structure:load` + `bundle exec rake environment db:drop db:structure:load` assert_match(/#{expected[:database]}/, ActiveRecord::Base.connection_config[:database]) require "#{app_path}/app/models/book" |