knapsack_pro 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 154cc1aaba977644e5f9dd5298e594ba4e6bbc4a67ec1edf1caac2aaf3d21ebb
-  data.tar.gz: 11a7acd42b97cd0e2d0075733e0a34ebcc5677f1cbd2e5342cccb2745405cadd
+  metadata.gz: 8c6268ccfd0e07224b6fbae963baa01c2f6344b924b7b3b1097a42474c57e3b7
+  data.tar.gz: 909d3632bcede5ecd49e075edc62b4c8a602b31cd1e059c99097a92bd6b21c75
 SHA512:
-  metadata.gz: 733e3fc942afe5ba74bc1b689ac9255bba46e28ddfdd60a826a0946f68a9c208d139786c2ff32319885adbe1c1a0e0696d9f63c5dc1a916b6b5a4072af3e9de8
-  data.tar.gz: 5769bf6874b3b93a1349268688d0304015da91072d9661852b034e937628f1be51d17a4e96a9124713fc6a730f953257989ba4613c6d5246de6ac8ec332c21e7
+  metadata.gz: 94cd957dcb04b6157e0aa6902cf6576e67857099b7c4db232742d7a420d08cc588e0dead4bb1d9ec7103024de0b2fe9edbeddacc0575d00533e530cd4c125465
+  data.tar.gz: cf30d4fddcab85d7ce32b589ef624bf08e78eb7d2ad236410c0d162538f3eee457311a7ff9a3ac08fb25440490574d707bf171d252e8dda4b9457138feced4b5

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-### UNRELEASED
+### UNRELEASED (patch)
+
+### 8.3.1
+
+* Fix RSpec TimeTracker to properly track `before(:all)/after(:all)`.
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/303
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v8.3.0...v8.3.1
+
 
 ### 8.3.0
 

data/lib/knapsack_pro/formatters/time_tracker.rb

@@ -19,7 +19,7 @@ module KnapsackPro
         @output = StringIO.new
         @time_each = nil
         @time_all = nil
-        @before_all = 0.0
+        @time_all_by_group_id_path = Hash.new(0)
         @group = {}
         @paths = {}
         @suite_started = now
@@ -38,12 +38,12 @@ module KnapsackPro
       end
 
       def example_group_started(notification)
-        return unless top_level_group?(notification.group)
+        record_time_all(notification.group.parent_groups[1], @time_all_by_group_id_path, @time_all)
         @time_all = now
       end
 
-      def example_started(_notification)
-        @before_all = now - @time_all if @before_all == 0.0
+      def example_started(notification)
+        record_time_all(notification.example.example_group, @time_all_by_group_id_path, @time_all)
         @time_each = now
       end
 
@@ -53,11 +53,12 @@ module KnapsackPro
       end
 
       def example_group_finished(notification)
+        record_time_all(notification.group, @time_all_by_group_id_path, @time_all)
+        @time_all = now
         return unless top_level_group?(notification.group)
 
-        after_all = @time_all.nil? ? 0.0 : now - @time_all
-        add_hooks_time(@group, @before_all, after_all)
-        @before_all = 0.0
+        add_hooks_time(@group, @time_all_by_group_id_path)
+        @time_all_by_group_id_path = Hash.new(0)
         @paths = merge(@paths, @group)
         @group = {}
       end
@@ -104,10 +105,17 @@ module KnapsackPro
         group.metadata[:parent_example_group].nil?
       end
 
-      def add_hooks_time(group, before_all, after_all)
+      def add_hooks_time(group, time_all_by_group_id_path)
         group.each do |_, example|
           next if example[:time_execution] == 0.0
-          example[:time_execution] += before_all + after_all
+
+          example[:time_execution] += time_all_by_group_id_path.sum do |group_id_path, time|
+            # :path is a file path (a_spec.rb), sum any before/after(:all) in the file
+            next time if group_id_path.start_with?(example[:path])
+            # :path is an id path (a_spec.rb[1:1]), sum any before/after(:all) above it
+            next time if example[:path].start_with?(group_id_path[0..-2])
+            0
+          end
         end
       end
 
@@ -123,6 +131,13 @@ module KnapsackPro
         end
       end
 
+      def record_time_all(group, time_all_by_group_id_path, time_all)
+        return unless group # above top level group
+
+        group_id_path = KnapsackPro::TestFileCleaner.clean(group.id)
+        time_all_by_group_id_path[group_id_path] += now - time_all
+      end
+
       def path_for(example)
         file_path = file_path_for(example)
         return nil if file_path == ""

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '8.3.0'
+  VERSION = '8.3.1'
 end

data/spec/knapsack_pro/formatters/time_tracker_specs.rb

@@ -220,6 +220,63 @@ class TestTimeTracker
     end
   end
 
+  def test_nested_hooks
+    KnapsackPro::Formatters::TimeTracker.define_method(:rspec_split_by_test_example?) do |_file|
+      false
+    end
+
+    spec = <<~SPEC
+      describe "KnapsackPro::Formatters::TimeTracker" do
+        before(:all) do
+          sleep 0.1
+        end
+
+        after(:all) do
+          sleep 0.1
+        end
+
+        it do
+          expect(1).to eq 1
+        end
+
+        describe do
+          before(:all) do
+            sleep 0.1
+          end
+
+          after(:all) do
+            sleep 0.1
+          end
+
+          it do
+            expect(1).to eq 1
+          end
+        end
+
+        describe do
+          before(:all) do
+            sleep 0.1
+          end
+
+          after(:all) do
+            sleep 0.1
+          end
+
+          it do
+            expect(1).to eq 1
+          end
+        end
+      end
+    SPEC
+
+    run_specs(spec) do |spec_paths, times|
+      raise unless times.size == 1
+      raise unless times[0]["path"] == spec_paths.first
+      raise unless times[0]["time_execution"] > 0.60
+      raise unless times[0]["time_execution"] < 0.65
+    end
+  end
+
   def test_hooks_with_rspec_split_by_test_example
     KnapsackPro::Formatters::TimeTracker.define_method(:rspec_split_by_test_example?) do |_file|
       true
@@ -263,6 +320,68 @@ class TestTimeTracker
     end
   end
 
+  def test_nested_hooks_with_rspec_split_by_test_example
+    KnapsackPro::Formatters::TimeTracker.define_method(:rspec_split_by_test_example?) do |_file|
+      true
+    end
+
+    spec = <<~SPEC
+      describe "KnapsackPro::Formatters::TimeTracker" do
+        before(:all) do
+          sleep 0.1
+        end
+
+        after(:all) do
+          sleep 0.1
+        end
+
+        it do
+          expect(1).to eq 1
+        end
+
+        describe do
+          before(:all) do
+            sleep 0.1
+          end
+
+          after(:all) do
+            sleep 0.1
+          end
+
+          it do
+            expect(1).to eq 1
+          end
+        end
+
+        describe do
+          before(:all) do
+            sleep 0.1
+          end
+
+          after(:all) do
+            sleep 0.1
+          end
+
+          it do
+            expect(1).to eq 1
+          end
+        end
+      end
+    SPEC
+
+    run_specs(spec) do |spec_paths, times|
+      raise unless times.size == 3
+      spec_path = spec_paths.first
+      raise unless times.find { |time| time["path"] == "#{spec_path}[1:1]" }["time_execution"] > 0.20
+      raise unless times.find { |time| time["path"] == "#{spec_path}[1:1]" }["time_execution"] < 0.25
+      raise unless times.find { |time| time["path"] == "#{spec_path}[1:2:1]" }["time_execution"] > 0.40
+      raise unless times.find { |time| time["path"] == "#{spec_path}[1:2:1]" }["time_execution"] < 0.45
+      raise unless times.find { |time| time["path"] == "#{spec_path}[1:3:1]" }["time_execution"] > 0.40
+      raise unless times.find { |time| time["path"] == "#{spec_path}[1:3:1]" }["time_execution"] < 0.45
+    end
+  end
+
+
   def test_unknown_path
     KnapsackPro::Formatters::TimeTracker.class_eval do
       alias_method :original_file_path_for, :file_path_for

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - ArturT
 bindir: bin
 cert_chain: []
-date: 2025-05-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -428,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel
   job finish work at a similar time.