knapsack_pro 2.18.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a298724c7651190199978edc99b96116abcbb827d12237e128f2c5d87297847
-  data.tar.gz: 2750130109b114747278d86fd4bc2477d143b2f1f3564f7b36d224f5044e29cf
+  metadata.gz: e5187abddda32d96fdec255f8aa2e740f0c85e856d882fa31790e4e8c93a87e8
+  data.tar.gz: 22320f9e0795684f81a53fb4fffb29295b28b0068fef5c54739c14e423eed003
 SHA512:
-  metadata.gz: 7742dbaf98eb6bc1aeda1c15c2dd3b8f627fe27c91fa58a4f46e71d2ff4839d5899005b36deddcb619745689dd6426f9319df1b70ad26f317be2cea2e6922799
-  data.tar.gz: a102bc5ab00cabc5ec4f7007e52081fd97ca194ea8e84072b2df8fb66664c6e320ea7b76d0970aa702ed9549e36bd5c702a7156de914b5fbdf9fe00c43de8351
+  metadata.gz: 07ea71f123f6995a6174b45561818c9ff5bf2565a141d1c49261ebf448027953fd1e822806ed1a04db962dad7fcee0fe27d025b4823c58b34d0519d2f04275a0
+  data.tar.gz: a84f3ae6a0b69d33e16e3efd5338e13e3b09c8db9bea6f26d77523436ff370722341586732ce28df4011f5379102fdae18ce9f7a5673286f2f0323c5b5102709

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### 3.0.0
+
+* __(breaking change)__ Remove support for RSpec 2.x. This change was already done by accident in [the pull request](https://github.com/KnapsackPro/knapsack_pro-ruby/pull/143) when we added the RSpec `context` hook, which is available only since RSpec 3.x.
+* Use RSpec `example` block argument instead of the global `RSpec.current_example`. This allows to run tests with the `async-rspec` gem.
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/153
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.18.2...v3.0.0
+
 ### 2.18.2
 
 * Track all test files assigned to a CI node in Regular Mode including pending test files in order to retry proper set of tests on the retried CI node

data/knapsack_pro.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake', '>= 0'
 
   spec.add_development_dependency 'bundler', '>= 1.6'
-  spec.add_development_dependency 'rspec', '~> 3.0', '>= 2.10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '~> 1.3'
   spec.add_development_dependency 'cucumber', '>= 0'
   spec.add_development_dependency 'spinach', '>= 0.8'

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -24,8 +24,10 @@ module KnapsackPro
         cli_args.any? { |arg| arg.start_with?('-f') || arg.start_with?('--format') }
       end
 
-      def self.test_path(example_group)
-        if defined?(::Turnip) && ::Turnip::VERSION.to_i < 2
+      def self.test_path(example)
+        example_group = example.metadata[:example_group]
+
+        if defined?(::Turnip) && Gem::Version.new(::Turnip::VERSION) < Gem::Version.new('2.0.0')
           unless example_group[:turnip]
             until example_group[:parent_example_group].nil?
               example_group = example_group[:parent_example_group]
@@ -51,14 +53,7 @@ module KnapsackPro
             # this way we count time spend in runtime for the previous test example after around(:each) is already done
             KnapsackPro.tracker.stop_timer
 
-            current_example_group =
-              if ::RSpec.respond_to?(:current_example)
-                ::RSpec.current_example.metadata[:example_group]
-              else
-                example.metadata
-              end
-
-            current_test_path = KnapsackPro::Adapters::RSpecAdapter.test_path(current_example_group)
+            current_test_path = KnapsackPro::Adapters::RSpecAdapter.test_path(example)
 
             KnapsackPro.tracker.current_test_path =
               if KnapsackPro::Config::Env.rspec_split_by_test_examples? && KnapsackPro::Adapters::RSpecAdapter.slow_test_file?(RSpecAdapter, current_test_path)

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '2.18.2'
+  VERSION = '3.0.0'
 end

data/spec/knapsack_pro/adapters/rspec_adapter_spec.rb

@@ -111,7 +111,7 @@ describe KnapsackPro::Adapters::RSpecAdapter do
   end
 
   describe '.test_path' do
-    let(:current_example_metadata) do
+    let(:example_group) do
       {
         file_path: '1_shared_example.rb',
         parent_example_group: {
@@ -122,14 +122,19 @@ describe KnapsackPro::Adapters::RSpecAdapter do
         }
       }
     end
+    let(:current_example) do
+      OpenStruct.new(metadata: {
+        example_group: example_group
+      })
+    end
 
-    subject { described_class.test_path(current_example_metadata) }
+    subject { described_class.test_path(current_example) }
 
     it { should eql 'a_spec.rb' }
 
     context 'with turnip features' do
       describe 'when the turnip version is less than 2' do
-        let(:current_example_metadata) do
+        let(:example_group) do
           {
             file_path: "./spec/features/logging_in.feature",
             turnip: true,
@@ -145,7 +150,7 @@ describe KnapsackPro::Adapters::RSpecAdapter do
       end
 
       describe 'when turnip is version 2 or greater' do
-        let(:current_example_metadata) do
+        let(:example_group) do
           {
             file_path: "gems/turnip-2.0.0/lib/turnip/rspec.rb",
             turnip: true,
@@ -170,13 +175,7 @@ describe KnapsackPro::Adapters::RSpecAdapter do
       let(:logger) { instance_double(Logger) }
       let(:global_time) { 'Global time: 01m 05s' }
       let(:test_path) { 'spec/a_spec.rb' }
-      let(:example) { double }
-      let(:example_group) { double }
-      let(:current_example) do
-        OpenStruct.new(metadata: {
-          example_group: example_group
-        })
-      end
+      let(:current_example) { double }
 
       context 'when rspec split by test examples is disabled' do
         before do
@@ -189,19 +188,18 @@ describe KnapsackPro::Adapters::RSpecAdapter do
           allow(KnapsackPro).to receive(:tracker).and_return(tracker)
           expect(tracker).to receive(:start_timer).ordered
 
-          expect(config).to receive(:around).with(:each).and_yield(example)
+          expect(config).to receive(:around).with(:each).and_yield(current_example)
           expect(config).to receive(:append_after).with(:context).and_yield
           expect(config).to receive(:after).with(:suite).and_yield
           expect(::RSpec).to receive(:configure).and_yield(config)
 
           expect(tracker).to receive(:stop_timer).ordered
 
-          expect(::RSpec).to receive(:current_example).twice.and_return(current_example)
-          expect(described_class).to receive(:test_path).with(example_group).and_return(test_path)
+          expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
 
           expect(tracker).to receive(:current_test_path=).with(test_path).ordered
 
-          expect(example).to receive(:run)
+          expect(current_example).to receive(:run)
 
           expect(tracker).to receive(:stop_timer).ordered
 
@@ -226,26 +224,25 @@ describe KnapsackPro::Adapters::RSpecAdapter do
           end
 
           it 'records time for example.id' do
-            expect(example).to receive(:id).and_return(test_example_path)
+            expect(current_example).to receive(:id).and_return(test_example_path)
 
             expect(config).to receive(:prepend_before).with(:context).and_yield
 
             allow(KnapsackPro).to receive(:tracker).and_return(tracker)
             expect(tracker).to receive(:start_timer).ordered
 
-            expect(config).to receive(:around).with(:each).and_yield(example)
+            expect(config).to receive(:around).with(:each).and_yield(current_example)
             expect(config).to receive(:append_after).with(:context).and_yield
             expect(config).to receive(:after).with(:suite).and_yield
             expect(::RSpec).to receive(:configure).and_yield(config)
 
             expect(tracker).to receive(:stop_timer).ordered
 
-            expect(::RSpec).to receive(:current_example).twice.and_return(current_example)
-            expect(described_class).to receive(:test_path).with(example_group).and_return(test_path)
+            expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
 
             expect(tracker).to receive(:current_test_path=).with(test_example_path).ordered
 
-            expect(example).to receive(:run)
+            expect(current_example).to receive(:run)
 
             expect(tracker).to receive(:stop_timer).ordered
 
@@ -268,19 +265,18 @@ describe KnapsackPro::Adapters::RSpecAdapter do
             allow(KnapsackPro).to receive(:tracker).and_return(tracker)
             expect(tracker).to receive(:start_timer).ordered
 
-            expect(config).to receive(:around).with(:each).and_yield(example)
+            expect(config).to receive(:around).with(:each).and_yield(current_example)
             expect(config).to receive(:append_after).with(:context).and_yield
             expect(config).to receive(:after).with(:suite).and_yield
             expect(::RSpec).to receive(:configure).and_yield(config)
 
-            expect(::RSpec).to receive(:current_example).twice.and_return(current_example)
-            expect(described_class).to receive(:test_path).with(example_group).and_return(test_path)
+            expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
 
             expect(tracker).to receive(:stop_timer).ordered
 
             expect(tracker).to receive(:current_test_path=).with(test_path).ordered
 
-            expect(example).to receive(:run)
+            expect(current_example).to receive(:run)
 
             expect(tracker).to receive(:stop_timer).ordered
 

data/spec/knapsack_pro/runners/minitest_runner_spec.rb

@@ -14,12 +14,17 @@ describe KnapsackPro::Runners::MinitestRunner do
     end
 
     context 'when test files were returned by Knapsack Pro API' do
+      let(:test_file_paths) { ['test_fake/a_test.rb', 'test_fake/b_test.rb'] }
+
       before do
         expect(KnapsackPro::Adapters::MinitestAdapter).to receive(:verify_bind_method_called)
+
+        tracker = instance_double(KnapsackPro::Tracker)
+        expect(KnapsackPro).to receive(:tracker).and_return(tracker)
+        expect(tracker).to receive(:set_prerun_tests).with(test_file_paths)
       end
 
       it 'runs tests' do
-        test_file_paths = ['test_fake/a_test.rb', 'test_fake/b_test.rb']
         runner = instance_double(described_class,
                                  test_dir: 'test',
                                  test_file_paths: test_file_paths,

data/spec/knapsack_pro/runners/test_unit_runner_spec.rb

@@ -13,10 +13,15 @@ describe KnapsackPro::Runners::TestUnitRunner do
     end
 
     context 'when test files were returned by Knapsack Pro API' do
+      let(:test_file_paths) { ['test-unit_fake/a_test.rb', 'test-unit_fake/b_test.rb'] }
+
       it 'runs tests' do
         expect(KnapsackPro::Adapters::TestUnitAdapter).to receive(:verify_bind_method_called)
 
-        test_file_paths = ['test-unit_fake/a_test.rb', 'test-unit_fake/b_test.rb']
+        tracker = instance_double(KnapsackPro::Tracker)
+        expect(KnapsackPro).to receive(:tracker).and_return(tracker)
+        expect(tracker).to receive(:set_prerun_tests).with(test_file_paths)
+
         runner = instance_double(described_class,
                                  test_dir: 'test-unit_fake',
                                  test_file_paths: test_file_paths,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 2.18.2
+  version: 3.0.0
 platform: ruby
 authors:
 - ArturT
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,9 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -409,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel