aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/test_runner_test.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-01-24 16:05:20 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-01-24 16:05:20 +0100
commit1969753974f3790974fc22ea0617d2e96145284d (patch)
treee43b4d004f12e205f6b041c33fac6e8d24e8a222 /railties/test/application/test_runner_test.rb
parent53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc (diff)
parente3b04447f48761bb128d6b58c94443c68ee44a36 (diff)
downloadrails-1969753974f3790974fc22ea0617d2e96145284d.tar.gz
rails-1969753974f3790974fc22ea0617d2e96145284d.tar.bz2
rails-1969753974f3790974fc22ea0617d2e96145284d.zip
Merge pull request #23212 from vipulnsward/bin-rails
Be consistent in testing outputs from railties test and use /bin/rails
Diffstat (limited to 'railties/test/application/test_runner_test.rb')
-rw-r--r--railties/test/application/test_runner_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 0745abf381..a7eb0feb11 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -445,7 +445,8 @@ module ApplicationTests
def test_pass_TEST_env_on_rake_test
create_test_file :models, 'account'
create_test_file :models, 'post', pass: false
-
+ # This specifically verifies TEST for backwards compatibility with rake test
+ # as bin/rails test already supports running tests from a single file more cleanly.
output = Dir.chdir(app_path) { `bin/rake test TEST=test/models/post_test.rb` }
assert_match "PostTest", output, "passing TEST= should run selected test"
@@ -540,7 +541,7 @@ module ApplicationTests
end
def run_migration
- Dir.chdir(app_path) { `bin/rake db:migrate` }
+ Dir.chdir(app_path) { `bin/rails db:migrate` }
end
end
end