1 files changed, 49 insertions, 7 deletions
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 64e99626eb..e1fe92a11b 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -1,9 +1,30 @@
+require "active_support/core_ext/class/attribute"
 require "minitest"
 
 module Rails
   class TestUnitReporter < Minitest::StatisticsReporter
+    class_attribute :executable
+    self.executable = "bin/rails test"
+
+    def record(result)
+      super
+
+      if output_inline? && result.failure && (!result.skipped? || options[:verbose])
+        io.puts
+        io.puts
+        io.puts result.failures.map(&:message)
+        io.puts
+        io.puts format_rerun_snippet(result)
+        io.puts
+      end
+
+      if fail_fast? && result.failure && !result.error? && !result.skipped?
+        raise Interrupt
+      end
+    end
+
     def report
-      return if results.empty?
+      return if output_inline? || filtered_results.empty?
       io.puts
       io.puts "Failed tests:"
       io.puts
@@ -11,12 +32,33 @@ module Rails
     end
 
     def aggregated_results # :nodoc:
-      filtered_results = results.dup
-      filtered_results.reject!(&:skipped?) unless options[:verbose]
-      filtered_results.map do |result|
-        location, line = result.method(result.name).source_location
-        "bin/rails test #{location}:#{line}"
-      end.join "\n"
+      filtered_results.map { |result| format_rerun_snippet(result) }.join "\n"
+    end
+
+    def filtered_results
+      if options[:verbose]
+        results
+      else
+        results.reject(&:skipped?)
+      end
+    end
+
+    def relative_path_for(file)
+      file.sub(/^#{Rails.root}\/?/, '')
     end
+
+    private
+      def output_inline?
+        options[:output_inline]
+      end
+
+      def fail_fast?
+        options[:fail_fast]
+      end
+
+      def format_rerun_snippet(result)
+        location, line = result.method(result.name).source_location
+        "#{self.executable} #{relative_path_for(location)}:#{line}"
+      end
   end
 end