3 files changed, 31 insertions, 31 deletions

diff --git a/railties/lib/rails/test_unit/line_filtering.rb b/railties/lib/rails/test_unit/line_filtering.rb
index dab4d3631d..dd9732bb12 100644
--- a/railties/lib/rails/test_unit/line_filtering.rb
+++ b/railties/lib/rails/test_unit/line_filtering.rb
@@ -13,9 +13,12 @@ module Rails
   end
 
   class CompositeFilter # :nodoc:
+    attr_reader :named_filter
+
     def initialize(runnable, filter, patterns)
       @runnable = runnable
-      @filters = [ derive_regexp(filter), *derive_line_filters(patterns) ].compact
+      @named_filter = derive_named_filter(filter)
+      @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
     end
 
     # Minitest uses === to find matching filters.
@@ -24,9 +27,14 @@ module Rails
     end
 
     private
-      def derive_regexp(filter)
-        # Regexp filtering copied from Minitest.
-        filter =~ %r%/(.*)/% ? Regexp.new($1) : filter
+      def derive_named_filter(filter)
+        if filter.respond_to?(:named_filter)
+          filter.named_filter
+        elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
+          Regexp.new $1
+        elsif filter.is_a?(String)
+          filter
+        end
       end
 
       def derive_line_filters(patterns)
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 29a3d991b8..076ab536be 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -1,6 +1,7 @@
 require "active_support/core_ext/module/attribute_accessors"
 require "rails/test_unit/reporter"
 require "rails/test_unit/test_requirer"
+require 'shellwords'
 
 module Minitest
   class SuppressedSummaryReporter < SummaryReporter
@@ -42,7 +43,7 @@ module Minitest
     end
 
     opts.on("-f", "--fail-fast",
-            "Abort test run on first failure") do
+            "Abort test run on first failure or error") do
       options[:fail_fast] = true
     end
 
@@ -53,27 +54,26 @@ module Minitest
 
     options[:color] = true
     options[:output_inline] = true
-    options[:patterns] = opts.order!
+    options[:patterns] = defined?(@rake_patterns) ? @rake_patterns : opts.order!
   end
 
   # Running several Rake tasks in a single command would trip up the runner,
   # as the patterns would also contain the other Rake tasks.
   def self.rake_run(patterns) # :nodoc:
     @rake_patterns = patterns
-    passed = run
+    passed = run(Shellwords.split(ENV['TESTOPTS'] || ''))
     exit passed unless passed
     passed
   end
 
+  # Owes great inspiration to test runner trailblazers like RSpec,
+  # minitest-reporters, maxitest and others.
   def self.plugin_rails_init(options)
     self.run_with_rails_extension = true
 
     ENV["RAILS_ENV"] = options[:environment] || "test"
 
-    unless run_with_autorun
-      patterns = defined?(@rake_patterns) ? @rake_patterns : options[:patterns]
-      ::Rails::TestRequirer.require_files(patterns)
-    end
+    ::Rails::TestRequirer.require_files(options[:patterns]) unless run_with_autorun
 
     unless options[:full_backtrace] || ENV["BACKTRACE"]
       # Plugin can run without Rails loaded, check before filtering.
@@ -81,14 +81,18 @@ module Minitest
     end
 
     # Replace progress reporter for colors.
-    self.reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
-    self.reporter << SuppressedSummaryReporter.new(options[:io], options)
-    self.reporter << ::Rails::TestUnitReporter.new(options[:io], options)
+    reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
+    reporter << SuppressedSummaryReporter.new(options[:io], options)
+    reporter << ::Rails::TestUnitReporter.new(options[:io], options)
   end
 
   mattr_accessor(:run_with_autorun)         { false }
   mattr_accessor(:run_with_rails_extension) { false }
 end
 
+# Put Rails as the first plugin minitest initializes so other plugins
+# can override or replace our default reporter setup.
+# Since minitest only loads plugins if its extensions are empty we have
+# to call `load_plugins` first.
 Minitest.load_plugins
-Minitest.extensions << 'rails'
+Minitest.extensions.unshift 'rails'
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 73b8d7d27b..4086d5b731 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -18,13 +18,13 @@ module Rails
       if output_inline? && result.failure && (!result.skipped? || options[:verbose])
         io.puts
         io.puts
-        io.puts format_failures(result).map { |line| color_output(line, by: result) }
+        io.puts color_output(result, by: result)
         io.puts
         io.puts format_rerun_snippet(result)
         io.puts
       end
 
-      if fail_fast? && result.failure && !result.error? && !result.skipped?
+      if fail_fast? && result.failure && !result.skipped?
         raise Interrupt
       end
     end
@@ -66,21 +66,9 @@ module Rails
         "%s#%s = %.2f s = %s" % [result.class, result.name, result.time, result.result_code]
       end
 
-      def format_failures(result)
-        result.failures.map do |failure|
-          "#{failure.result_label}:\n#{result.class}##{result.name}:\n#{failure.message}\n"
-        end
-      end
-
       def format_rerun_snippet(result)
-        # Try to extract path to assertion from backtrace.
-        if result.location =~ /\[(.*)\]\z/
-          assertion_path = $1
-        else
-          assertion_path = result.method(result.name).source_location.join(':')
-        end
-
-        "#{self.executable} #{relative_path_for(assertion_path)}"
+        location, line = result.method(result.name).source_location
+        "#{self.executable} #{relative_path_for(location)}:#{line}"
       end
 
       def app_root