setup profile notification to delegate slowest_examples groups to the profiler

Author: JonRowe

lib/rspec/core/formatters/json_formatter.rb

@@ -60,8 +60,7 @@ def dump_profile(profile)
         # @api private
         def dump_profile_slowest_examples(profile)
           @output_hash[:profile] = {}
-          sorted_examples = profile.slowest_examples
-          @output_hash[:profile][:examples] = sorted_examples.map do |example|
+          @output_hash[:profile][:examples] = profile.slowest_examples.map do |example|
             format_example(example).tap do |hash|
               hash[:run_time] = example.execution_result.run_time
             end

lib/rspec/core/notifications.rb

@@ -496,7 +496,8 @@ def duplicate_rerun_locations
     # @attr duration [Float] the time taken (in seconds) to run the suite
     # @attr examples [Array<RSpec::Core::Example>] the examples run
     # @attr number_of_examples [Fixnum] the number of examples to profile
-    ProfileNotification = Struct.new(:duration, :examples, :number_of_examples)
+    # @attr profiler [RSpec::Core::Profiler] the profiler used to capture examples
+    ProfileNotification = Struct.new(:duration, :examples, :number_of_examples, :profiler)
     class ProfileNotification
       # @return [Array<RSpec::Core::Example>] the slowest examples
       def slowest_examples
@@ -524,8 +525,14 @@ def percentage
       end
 
       # @return [Array<RSpec::Core::Example>] the slowest example groups
-      # todo rename this method or move it's code to the json_formater.rb and profile.formater.rb
-      def calculate_slowest_groups(example_groups)
+      def slowest_groups
+        @slowest_groups ||= calculate_slowest_groups
+      end
+
+    private
+
+      def calculate_slowest_groups
+        example_groups = profiler.example_groups
 
         # stop if we've only one example group
         return {} if example_groups.keys.length <= 1

lib/rspec/core/reporter.rb

@@ -150,7 +150,8 @@ def finish
         notify :deprecation_summary, Notifications::NullNotification
         unless mute_profile_output?
           notify :dump_profile, Notifications::ProfileNotification.new(@duration, @examples,
-                                                                       @configuration.profile_examples)
+                                                                       @configuration.profile_examples,
+                                                                       @configuration.profiler)
         end
         notify :dump_summary, Notifications::SummaryNotification.new(@duration, @examples, @failed_examples,
                                                                      @pending_examples, @load_time)

spec/rspec/core/formatters/json_formatter_spec.rb

@@ -133,8 +133,8 @@ def profile *groups
     end
 
     before do
+      setup_profiler
       formatter
-      config.profile_examples = 10
     end
 
     context "with one example group" do

spec/rspec/core/formatters/profile_formatter_spec.rb

@@ -4,6 +4,7 @@
   include FormatterSupport
 
   def profile *groups
+    setup_profiler
     groups.each { |group| group.run(reporter) }
     examples = groups.map(&:examples).flatten
     total_time = examples.map { |e| e.execution_result.run_time }.inject(&:+)

spec/support/formatter_support.rb

@@ -185,6 +185,11 @@ def setup_reporter(*streams)
     @reporter = config.reporter
   end
 
+  def setup_profiler
+    config.profile_examples = true
+    config.profiler
+  end
+
   def formatter_output
     @formatter_output ||= StringIO.new
   end
@@ -274,7 +279,7 @@ def summary_notification(duration, examples, failed, pending, time)
   end
 
   def profile_notification(duration, examples, number)
-    ::RSpec::Core::Notifications::ProfileNotification.new duration, examples, number
+    ::RSpec::Core::Notifications::ProfileNotification.new duration, examples, number, config.profiler
   end
 
 end