Use autorun when running via Rake.

Makes sure we get support for `Minitest.after_run` hooks and don't
accidentally run tests twice.

Requires overriding minitest `run` to respect the TESTOPTS variable.

1 files changed, 13 insertions, 3 deletions

diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 0544847293..6e196a32ab 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -61,11 +61,21 @@ module Minitest
   # as the patterns would also contain the other Rake tasks.
   def self.rake_run(patterns) # :nodoc:
     @rake_patterns = patterns
-    passed = run(Shellwords.split(ENV["TESTOPTS"] || ""))
-    exit passed unless passed
-    passed
+    autorun
   end
 
+  module RunRespectingRakeTestopts
+    def run(args = [])
+      if defined?(@rake_patterns)
+        args = Shellwords.split(ENV["TESTOPTS"] || "")
+      end
+
+      super
+    end
+  end
+
+  singleton_class.prepend RunRespectingRakeTestopts
+
   # Owes great inspiration to test runner trailblazers like RSpec,
   # minitest-reporters, maxitest and others.
   def self.plugin_rails_init(options)