Refactor handling of the first line of exception report

It allows detail or failure/error line to be used as the first line
by omitting preceding lines, rather than specifying content of detail or
failure/error as description.

Author: yujinakayama

lib/rspec/core/formatters/exception_presenter.rb

@@ -12,14 +12,13 @@ def initialize(exception, example, options={})
           @exception               = exception
           @example                 = example
           @message_color           = options.fetch(:message_color)          { RSpec.configuration.failure_color }
-          @description             = options.fetch(:description_formatter)  { Proc.new { example.full_description } }.call(self)
+          @description             = options.fetch(:description)            { example.full_description }
           @detail_formatter        = options.fetch(:detail_formatter)       { Proc.new {} }
           @extra_detail_formatter  = options.fetch(:extra_detail_formatter) { Proc.new {} }
           @backtrace_formatter     = options.fetch(:backtrace_formatter)    { RSpec.configuration.backtrace_formatter }
           @indentation             = options.fetch(:indentation, 2)
           @skip_shared_group_trace = options.fetch(:skip_shared_group_trace, false)
           @failure_lines           = options[:failure_lines]
-          @extra_failure_lines     = Array(example.metadata[:extra_failure_lines])
         end
 
         def message_lines
@@ -88,10 +87,6 @@ def fully_formatted_lines(failure_number, colorizer)
           lines
         end
 
-        def failure_slash_error_line
-          @failure_slash_error_line ||= "Failure/Error: #{read_failed_line.strip}"
-        end
-
       private
 
         def final_exception(exception)
@@ -143,17 +138,28 @@ def exception_class_name(exception=@exception)
         end
 
         def failure_lines
-          @failure_lines ||= begin
-            lines = []
-            lines << failure_slash_error_line unless (description == failure_slash_error_line)
-            lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
-            encoded_string(exception.message.to_s).split("\n").each do |line|
-              lines << (line.empty? ? line : "  #{line}")
-            end
-            unless @extra_failure_lines.empty?
-              lines << ''
-              lines.concat(@extra_failure_lines)
-              lines << ''
+          @failure_lines ||= [failure_slash_error_line] + exception_lines + extra_failure_lines
+        end
+
+        def failure_slash_error_line
+          "Failure/Error: #{read_failed_line.strip}"
+        end
+
+        def exception_lines
+          lines = []
+          lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
+          encoded_string(exception.message.to_s).split("\n").each do |line|
+            lines << (line.empty? ? line : "  #{line}")
+          end
+          lines
+        end
+
+        def extra_failure_lines
+          @extra_failure_lines ||= begin
+            lines = Array(example.metadata[:extra_failure_lines])
+            unless lines.empty?
+              lines.unshift('')
+              lines.push('')
             end
             lines
           end
@@ -239,9 +245,9 @@ def options
           def pending_options
             if @execution_result.pending_fixed?
               {
-                :description_formatter => Proc.new { "#{@example.full_description} FIXED" },
-                :message_color         => RSpec.configuration.fixed_color,
-                :failure_lines         => [
+                :description   => "#{@example.full_description} FIXED",
+                :message_color => RSpec.configuration.fixed_color,
+                :failure_lines => [
                   "Expected pending '#{@execution_result.pending_message}' to fail. No Error was raised."
                 ]
               }
@@ -264,8 +270,6 @@ def with_multiple_error_options_as_needed(exception, options)
                                                                        options[:message_color])
             )
 
-            options[:description_formatter] &&= Proc.new {}
-
             return options unless exception.aggregation_metadata[:hide_backtrace]
             options[:backtrace_formatter] = EmptyBacktraceFormatter
             options
@@ -303,7 +307,7 @@ def sub_failure_list_formatter(exception, message_color)
               FlatMap.flat_map(exception.all_exceptions.each_with_index) do |failure, index|
                 options = with_multiple_error_options_as_needed(
                   failure,
-                  :description_formatter   => :failure_slash_error_line.to_proc,
+                  :description             => nil,
                   :indentation             => 0,
                   :message_color           => message_color || RSpec.configuration.failure_color,
                   :skip_shared_group_trace => true

spec/rspec/core/formatters/exception_presenter_spec.rb

@@ -81,7 +81,7 @@ module RSpec::Core
       it 'allows the caller to omit the description' do
         the_presenter = Formatters::ExceptionPresenter.new(exception, example,
                                                        :detail_formatter => Proc.new { "Detail!" },
-                                                       :description_formatter => Proc.new { })
+                                                       :description => nil)
 
         expect(the_presenter.fully_formatted(1)).to eq(<<-EOS.gsub(/^ +\|/, ''))
           |
@@ -94,7 +94,7 @@ module RSpec::Core
       end
 
       it 'allows the failure/error line to be used as the description' do
-        the_presenter = Formatters::ExceptionPresenter.new(exception, example, :description_formatter => lambda { |p| p.failure_slash_error_line })
+        the_presenter = Formatters::ExceptionPresenter.new(exception, example, :description => nil)
 
         expect(the_presenter.fully_formatted(1)).to eq(<<-EOS.gsub(/^ +\|/, ''))
           |