diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-10 21:13:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-10 21:13:22 +0200 |
| commit | 3fa66935fd65e2d834dcc743bd835afb5b875f7f (patch) | |
| tree | 361e00c0c82de24f359bbe5ba32b76d9913c609e /tools/test.rb | |
| parent | b6300f3ecc79bff29cf9bb804a30fd92403feac1 (diff) | |
| parent | 0d72489b2a08487f71dd4230846c01a5d99ef35f (diff) | |
| download | rails-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 'tools/test.rb')
| -rw-r--r-- | tools/test.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/test.rb b/tools/test.rb index 52e9c19198..774e4ec6c7 100644 --- a/tools/test.rb +++ b/tools/test.rb @@ -3,8 +3,10 @@ $: << File.expand_path("test", COMPONENT_ROOT) require "bundler" Bundler.setup -require "rails/test_unit/minitest_plugin" +require "rails/test_unit/runner" +require "rails/test_unit/reporter" require "rails/test_unit/line_filtering" +require "active_support" require "active_support/test_case" class << Rails @@ -17,5 +19,6 @@ end ActiveSupport::TestCase.extend Rails::LineFiltering Rails::TestUnitReporter.executable = "bin/test" -Minitest.run_via = :rails -require "active_support/testing/autorun" + +Rails::TestUnit::Runner.parse_options(ARGV) +Rails::TestUnit::Runner.run(ARGV) |