remove base formatter summary, only sets ivars unused elsewhere

rspec · Feb 6, 2014 · 7afd00c · 7afd00c
1 parent fde5f76
commit 7afd00c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/lib/rspec/core/formatters/base_formatter.rb b/lib/rspec/core/formatters/base_formatter.rb
@@ -15,12 +15,10 @@ class BaseFormatter
 
         # all formatters inheriting from this formatter will receive these notifications
         Formatters.register self, :start, :example_group_started, :example_started,
-                                  :example_pending, :example_failed, :dump_summary,
-                                  :close
+                                  :example_pending, :example_failed, :close
         include Helpers
         attr_accessor :example_group
-        attr_reader :duration, :examples, :output
-        attr_reader :example_count, :pending_count, :failure_count
+        attr_reader :examples, :output
         attr_reader :failed_examples, :pending_examples
 
         # @api public
@@ -136,6 +134,7 @@ def example_failed(notification)
         #
         # @return [nil]
 
+        # @method dump_summary
         # @api public
         #
         # This method is invoked after the dumping of examples and failures. Each parameter
@@ -145,12 +144,6 @@ def example_failed(notification)
         # @param example_count
         # @param failure_count
         # @param pending_count
-        def dump_summary(summary)
-          @duration      = summary.duration
-          @example_count = summary.examples
-          @failure_count = summary.failures
-          @pending_count = summary.pending
-        end
 
         # @method dump_pending
         # @api public

diff --git a/lib/rspec/core/formatters/base_text_formatter.rb b/lib/rspec/core/formatters/base_text_formatter.rb
@@ -35,7 +35,7 @@ def dump_failures(notification)
         # pending, and green otherwise.
         #
         # @param [String] string
-        def colorise_summary(summary)
+        def colorise_summary(summary, failure_count, pending_count)
           if failure_count > 0
             color(summary, RSpec.configuration.failure_color)
           elsif pending_count > 0
@@ -46,10 +46,9 @@ def colorise_summary(summary)
         end
 
         def dump_summary(summary)
-          super
           dump_profile unless mute_profile_output?(summary.failures)
           output.puts "\nFinished in #{format_duration(summary.duration)}\n"
-          output.puts colorise_summary(summary_line(summary.examples, summary.failures, summary.pending))
+          output.puts colorise_summary(summary_line(summary.examples, summary.failures, summary.pending), summary.failures, summary.pending_count)
           dump_commands_to_rerun_failed_examples
         end
 

diff --git a/lib/rspec/core/formatters/json_formatter.rb b/lib/rspec/core/formatters/json_formatter.rb
@@ -20,16 +20,15 @@ def message(notification)
         end
 
         def dump_summary(summary)
-          super
           @output_hash[:summary] = {
             :duration => summary.duration,
             :example_count => summary.examples,
             :failure_count => summary.failures,
             :pending_count => summary.pending
           }
-          @output_hash[:summary_line] = summary_line(example_count, failure_count, pending_count)
+          @output_hash[:summary_line] = summary_line(summary.examples, summary.failures, summary.pending)
 
-          dump_profile unless mute_profile_output?(failure_count)
+          dump_profile unless mute_profile_output?(summary.failures)
         end
 
         def stop(notification)

diff --git a/lib/rspec/core/formatters/legacy_formatter.rb b/lib/rspec/core/formatters/legacy_formatter.rb
@@ -49,7 +49,12 @@ def message(message)
             super MessageNotification.new(message) if defined?(super)
           end
 
+          attr_reader :duration, :example_count, :failure_count, :pending_count
           def dump_summary(duration, examples, failures, pending)
+            @duration      = duration
+            @example_count = examples
+            @failure_count = failures
+            @pending_count = pending
             super SummaryNotification.new(duration, examples, failures, pending) if defined?(super)
           end