aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-10 21:13:22 +0200
committerGitHub <noreply@github.com>2017-07-10 21:13:22 +0200
commit3fa66935fd65e2d834dcc743bd835afb5b875f7f (patch)
tree361e00c0c82de24f359bbe5ba32b76d9913c609e /railties/test/application
parentb6300f3ecc79bff29cf9bb804a30fd92403feac1 (diff)
parent0d72489b2a08487f71dd4230846c01a5d99ef35f (diff)
downloadrails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.tar.gz
rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.tar.bz2
rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.zip
Merge pull request #29572 from kaspth/test-runner-no-eager-require
Don't eagerly require Rails' minitest plugin.
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/test_runner_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 8e0712fca2..c0027ab9a2 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -16,13 +16,13 @@ module ApplicationTests
end
def test_run_via_backwardscompatibility
- require "rails/test_unit/minitest_plugin"
+ require "minitest/rails_plugin"
assert_nothing_raised do
Minitest.run_via[:ruby] = true
end
- assert_predicate Minitest.run_via, :ruby?
+ assert Minitest.run_via[:ruby]
end
def test_run_single_file