1 files changed, 68 insertions, 6 deletions
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 09b8675cf8..fe11664d5e 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -6,8 +6,31 @@ module Rails
     class_attribute :executable
     self.executable = "bin/rails test"
 
+    def record(result)
+      super
+
+      if options[:verbose]
+        io.puts color_output(format_line(result), by: result)
+      else
+        io.print color_output(result.result_code, by: result)
+      end
+
+      if output_inline? && result.failure && (!result.skipped? || options[:verbose])
+        io.puts
+        io.puts
+        io.puts color_output(result, by: result)
+        io.puts
+        io.puts format_rerun_snippet(result)
+        io.puts
+      end
+
+      if fail_fast? && result.failure && !result.skipped?
+        raise Interrupt
+      end
+    end
+
     def report
-      return if filtered_results.empty?
+      return if output_inline? || filtered_results.empty?
       io.puts
       io.puts "Failed tests:"
       io.puts
@@ -15,10 +38,7 @@ module Rails
     end
 
     def aggregated_results # :nodoc:
-      filtered_results.map do |result|
-        location, line = result.method(result.name).source_location
-        "#{self.executable} #{relative_path_for(location)}:#{line}"
-      end.join "\n"
+      filtered_results.map { |result| format_rerun_snippet(result) }.join "\n"
     end
 
     def filtered_results
@@ -30,7 +50,49 @@ module Rails
     end
 
     def relative_path_for(file)
-      file.sub(/^#{Rails.root}\/?/, '')
+      file.sub(/^#{app_root}\/?/, "")
     end
+
+    private
+      def output_inline?
+        options[:output_inline]
+      end
+
+      def fail_fast?
+        options[:fail_fast]
+      end
+
+      def format_line(result)
+        "%s#%s = %.2f s = %s" % [result.class, result.name, result.time, result.result_code]
+      end
+
+      def format_rerun_snippet(result)
+        location, line = result.method(result.name).source_location
+        "#{executable} #{relative_path_for(location)}:#{line}"
+      end
+
+      def app_root
+        @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+      end
+
+      def colored_output?
+        options[:color] && io.respond_to?(:tty?) && io.tty?
+      end
+
+      codes = { red: 31, green: 32, yellow: 33 }
+      COLOR_BY_RESULT_CODE = {
+        "." => codes[:green],
+        "E" => codes[:red],
+        "F" => codes[:red],
+        "S" => codes[:yellow]
+      }
+
+      def color_output(string, by:)
+        if colored_output?
+          "\e[#{COLOR_BY_RESULT_CODE[by.result_code]}m#{string}\e[0m"
+        else
+          string
+        end
+      end
   end
 end