aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-27 09:03:34 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-27 09:03:34 -0700
commit565d54d9ec167a5b9caf91bb53505d1e98c0ded5 (patch)
treee64ee98eb17c386af4ea10c2352bc6941aab4eda /railties/test
parent52f6e47682003c83b0466bf5e140ee302498a226 (diff)
parent6498bbe5146981dd6ca02f99dba5e10c18d8bc34 (diff)
downloadrails-565d54d9ec167a5b9caf91bb53505d1e98c0ded5.tar.gz
rails-565d54d9ec167a5b9caf91bb53505d1e98c0ded5.tar.bz2
rails-565d54d9ec167a5b9caf91bb53505d1e98c0ded5.zip
Merge pull request #6880 from kennyj/fix_20120628
Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/rake_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 6bb50fea19..a450f90dbf 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -157,7 +157,7 @@ module ApplicationTests
add_to_config "config.active_record.schema_format = :sql"
output = Dir.chdir(app_path) do
`rails generate scaffold user username:string;
- bundle exec rake db:migrate db:test:clone 2>&1 --trace`
+ bundle exec rake db:migrate db:test:prepare 2>&1 --trace`
end
assert_match(/Execute db:test:load_structure/, output)
end