2 files changed, 5 insertions, 11 deletions
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 29a3d991b8..03c705ffef 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -42,7 +42,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
 
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 73b8d7d27b..e81bd9df7e 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -24,7 +24,7 @@ module Rails
         io.puts
       end
 
-      if fail_fast? && result.failure && !result.error? && !result.skipped?
+      if fail_fast? && result.failure && !result.skipped?
         raise Interrupt
       end
     end
@@ -68,19 +68,13 @@ module Rails
 
       def format_failures(result)
         result.failures.map do |failure|
-          "#{failure.result_label}:\n#{result.class}##{result.name}:\n#{failure.message}\n"
+          "#{failure.result_label}:\n#{result.location}:\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