aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-15 10:45:03 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-15 10:45:03 -0800
commitb0e06ec0da901304cbf458676da0d3837e49cc4e (patch)
treed4e918f2a00ed69e35a2da4e09228a8cd5ccba4d /railties/test
parent0e5ef3f3ec2ec9568af34a970b19042a20cb0a34 (diff)
parent2648819ef1ec412cfd1798a0df58939c0f1641d5 (diff)
downloadrails-b0e06ec0da901304cbf458676da0d3837e49cc4e.tar.gz
rails-b0e06ec0da901304cbf458676da0d3837e49cc4e.tar.bz2
rails-b0e06ec0da901304cbf458676da0d3837e49cc4e.zip
Merge pull request #13312 from arthurnn/fix_db_task_req
db:test:clone and prepare must load environment
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/rake_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 08316d80e6..33d3c4a19e 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -208,7 +208,8 @@ 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;
+ bundle exec rake db:test:clone 2>&1 --trace`
end
assert_match(/Execute db:test:clone_structure/, output)
end
@@ -217,7 +218,8 @@ 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:prepare 2>&1 --trace`
+ bundle exec rake db:migrate;
+ bundle exec rake db:test:prepare 2>&1 --trace`
end
assert_match(/Execute db:test:load_structure/, output)
end