aboutsummaryrefslogtreecommitdiffstats
path: root/tools/test.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-07-17 07:10:27 -0600
committerGitHub <noreply@github.com>2017-07-17 07:10:27 -0600
commit404eceba8c8f0951407c2508567f6abefec76e4c (patch)
treecb8c690084083b6aee4a70ad29c24c0050f88bed /tools/test.rb
parente505bc8acd4448030fd4d2f85796bdb61d45a5b1 (diff)
parentfbade51248ea48db87703ba7418badbd3ed85e36 (diff)
downloadrails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.gz
rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.bz2
rails-404eceba8c8f0951407c2508567f6abefec76e4c.zip
Merge branch 'master' into make-reverse-merge-bang-order-consistent
Diffstat (limited to 'tools/test.rb')
-rw-r--r--tools/test.rb16
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/test.rb b/tools/test.rb
index 71349a5974..774e4ec6c7 100644
--- a/tools/test.rb
+++ b/tools/test.rb
@@ -3,18 +3,22 @@ $: << 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"
-module Rails
- # Necessary to get rerun-snippts working.
- def self.root
+class << Rails
+ # Necessary to get rerun-snippets working.
+ def root
@root ||= Pathname.new(COMPONENT_ROOT)
end
+ alias __root root
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)