knapsack_pro 2.15.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97f9fbc29f0a109fbbf35b6a544f2ad86208feb697b7ff81f8458b679843c91
-  data.tar.gz: 434871e67293512331dfe99ed7915eb0f96ae27d2a7b3a1023e8752c752455ac
+  metadata.gz: dfa70d9f5566c820f5ca45bc6c0dc52302ee7de056f4b50ad86739b3ca34960d
+  data.tar.gz: a5c877f7c89a4c94bbcd247a6fe75b8ff01a9e2be7f82b82fe4ac42dcdac489c
 SHA512:
-  metadata.gz: 3d5be26f0d227707d789b5d7243f3617ea6f839154725b555f0ada89b6600aef0b18aaa2532d018344c797a1f79465e27d3caadebb955d1ca00684b08f1be4ea
-  data.tar.gz: ddb85043aad801bbb9f47f51c36bace0c34b73f958968e821c7b2e8845cc0a302ef05d9e55033d260a86817d4a99d924084f8c29c86b87ce2c2a75fd96fef4af
+  metadata.gz: 390be4aa9a3bfa79da3149bbc7acdec09905aed17ddbac32998e7324cc23571bcb321e3ba541d3890df1993ab5a125c10edf5cfcf28f8568347ff96af8b18a94
+  data.tar.gz: 431ec87a1b9c17fb9e2c5dfde14d93118e0378731f6c70ff7fcb1ed4f74dcef773bd861be33d0d4327689d4d8fb9df333df59630f44c9be3212b3915f2ab5cd4

data/.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
     parallelism: 1
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.7.0
+      - image: circleci/ruby:3.0.1
         environment:
           CODECLIMATE_REPO_TOKEN: b6626e682a8e97e0c5978febc92c3526792a2d018b41b8e1b52689da37fb7d92
 

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+### 2.18.1
+
+* Ensure RSpec is loaded to check its version for RSpec split by test examples feature
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/151
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.18.0...v2.18.1
+
+### 2.18.0
+
+* Do not allow to use the RSpec tag option together with the RSpec split by test examples feature in knapsack_pro gem in Regular Mode 
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/148
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.17.0...v2.18.0
+
+### 2.17.0
+
+* Use Ruby 3 in development and add small improvements
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/147
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.16.0...v2.17.0
+
+### 2.16.0
+
+* Improve test time execution tracking for RSpec
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/145
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.15.0...v2.16.0
+
 ### 2.15.0
 
 * Do not allow to use the RSpec tag option together with the RSpec split by test examples feature

data/README.md

@@ -793,43 +793,7 @@ $ KNAPSACK_PRO_SALT=xxx bundle exec rake knapsack_pro:encrypted_branch_names[not
 
 If you are using circleci.com you can omit `KNAPSACK_PRO_CI_NODE_TOTAL` and `KNAPSACK_PRO_CI_NODE_INDEX`. Knapsack Pro will use `CIRCLE_NODE_TOTAL` and `CIRCLE_NODE_INDEX` provided by CircleCI.
 
-Here is an example for test configuration in your `circleci.yml` file.
-
-```yaml
-# CircleCI 1.0
-
-machine:
-  environment:
-    # Tokens should be set in CircleCI settings to avoid expose tokens in build logs
-    # KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: rspec-token
-    # KNAPSACK_PRO_TEST_SUITE_TOKEN_CUCUMBER: cucumber-token
-    # KNAPSACK_PRO_TEST_SUITE_TOKEN_MINITEST: minitest-token
-    # KNAPSACK_PRO_TEST_SUITE_TOKEN_TEST_UNIT: test-unit-token
-    # KNAPSACK_PRO_TEST_SUITE_TOKEN_SPINACH: spinach-token
-test:
-  override:
-    # Step for RSpec
-    - bundle exec rake knapsack_pro:rspec:
-        parallel: true # Caution: there are 8 spaces indentation!
-
-    # Step for Cucumber
-    - bundle exec rake knapsack_pro:cucumber:
-        parallel: true # Caution: there are 8 spaces indentation!
-
-    # Step for Minitest
-    - bundle exec rake knapsack_pro:minitest:
-        parallel: true # Caution: there are 8 spaces indentation!
-
-    # Step for test-unit
-    - bundle exec rake knapsack_pro:test_unit:
-        parallel: true # Caution: there are 8 spaces indentation!
-
-    # Step for Spinach
-    - bundle exec rake knapsack_pro:spinach:
-        parallel: true # Caution: there are 8 spaces indentation!
-```
-
-Here is another example for CircleCI 2.0 platform.
+Here is an example for test configuration in your `.circleci/config.yml` file.
 
 ```yaml
 # CircleCI 2.0
@@ -866,7 +830,7 @@ Please remember to add additional containers for your project in CircleCI settin
 
 ##### CircleCI and knapsack_pro Queue Mode
 
-If you use knapsack_pro Queue Mode with CircleCI you may want to [collect metadata](https://circleci.com/docs/1.0/test-metadata/#metadata-collection-in-custom-test-steps) like junit xml report about your RSpec test suite.
+If you use knapsack_pro Queue Mode with CircleCI you may want to [collect metadata](https://circleci.com/docs/2.0/collect-test-data/#metadata-collection-in-custom-test-steps) like junit xml report about your RSpec test suite.
 
 Here you can read how to configure [junit formatter](https://knapsackpro.com/faq/question/how-to-use-junit-formatter#how-to-use-junit-formatter-with-knapsack_pro-queue-mode). Step for CircleCI is to copy the xml report to `$CIRCLE_TEST_REPORTS` directory. Below is full config for your `spec_helper.rb`:
 
@@ -874,7 +838,7 @@ Here you can read how to configure [junit formatter](https://knapsackpro.com/faq
 # spec_helper.rb or rails_helper.rb
 
 # TODO This must be the same path as value for rspec --out argument
-# Note the path should not contain sign ~, for instance path ~/project/tmp/rspec.xml may not work. Please use full path instead.
+# Note the path should not contain ~ char, for instance path ~/project/tmp/rspec.xml may not work. Please use full path instead.
 TMP_RSPEC_XML_REPORT = 'tmp/rspec.xml'
 # move results to FINAL_RSPEC_XML_REPORT so the results won't accumulate with duplicated xml tags in TMP_RSPEC_XML_REPORT
 FINAL_RSPEC_XML_REPORT = 'tmp/rspec_final_results.xml'
@@ -913,6 +877,8 @@ Ensure you have in CircleCI config yml
     destination: test-results
 ```
 
+You can find a complete CircleCI YML config example in [the article](https://docs.knapsackpro.com/2021/rspec-testing-parallel-jobs-with-circleci-and-junit-xml-report).
+
 #### Info for Travis users
 
 You can parallelize your builds across virtual machines with [travis matrix feature](http://docs.travis-ci.com/user/speeding-up-the-build/#parallelizing-your-builds-across-virtual-machines). Edit `.travis.yml`

data/knapsack_pro.gemspec

@@ -29,14 +29,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 1.6'
   spec.add_development_dependency 'rspec', '~> 3.0', '>= 2.10.0'
-  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'rspec-its', '~> 1.3'
   spec.add_development_dependency 'cucumber', '>= 0'
   spec.add_development_dependency 'spinach', '>= 0.8'
   spec.add_development_dependency 'minitest', '>= 5.0.0'
   spec.add_development_dependency 'test-unit', '>= 3.0.0'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0'
   spec.add_development_dependency 'pry', '~> 0'
-  spec.add_development_dependency 'vcr', '~> 2.9'
-  spec.add_development_dependency 'webmock', '~> 1.21'
-  spec.add_development_dependency 'timecop', '>= 0.1.0'
+  spec.add_development_dependency 'vcr', '>= 6.0'
+  spec.add_development_dependency 'webmock', '>= 3.13'
+  spec.add_development_dependency 'timecop', '>= 0.9.4'
 end

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -3,6 +3,27 @@ module KnapsackPro
     class RSpecAdapter < BaseAdapter
       TEST_DIR_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
 
+      def self.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(cli_args)
+        if KnapsackPro::Config::Env.rspec_split_by_test_examples? && has_tag_option?(cli_args)
+          error_message = 'It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature. Please see: https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it#warning-dont-use-rspec-tag-option'
+          KnapsackPro.logger.error(error_message)
+          raise error_message
+        end
+      end
+
+      def self.has_tag_option?(cli_args)
+        # use start_with? because user can define tag option in a few ways:
+        # -t mytag
+        # -tmytag
+        # --tag mytag
+        # --tag=mytag
+        cli_args.any? { |arg| arg.start_with?('-t') || arg.start_with?('--tag') }
+      end
+
+      def self.has_format_option?(cli_args)
+        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
           unless example_group[:turnip]
@@ -26,6 +47,10 @@ module KnapsackPro
           end
 
           config.around(:each) do |example|
+            # stop timer to update time for a previously run test example
+            # 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]
@@ -46,6 +71,8 @@ module KnapsackPro
           end
 
           config.append_after(:context) do
+            # after(:context) hook is run one time only, after all of the examples in a group
+            # stop timer to count time for the very last executed test example
             KnapsackPro.tracker.stop_timer
           end
 

data/lib/knapsack_pro/base_allocator_builder.rb

@@ -34,6 +34,7 @@ module KnapsackPro
       test_files_to_run = all_test_files_to_run
 
       if adapter_class == KnapsackPro::Adapters::RSpecAdapter && KnapsackPro::Config::Env.rspec_split_by_test_examples?
+        require 'rspec/core/version'
         unless Gem::Version.new(::RSpec::Core::Version::STRING) >= Gem::Version.new('3.3.0')
           raise 'RSpec >= 3.3.0 is required to split test files by test examples. Learn more: https://github.com/KnapsackPro/knapsack_pro-ruby#split-test-files-by-test-cases'
         end

data/lib/knapsack_pro/config/ci/circle.rb

@@ -23,8 +23,7 @@ module KnapsackPro
         end
 
         def project_dir
-          project_repo_name = ENV['CIRCLE_PROJECT_REPONAME']
-          "/home/ubuntu/#{project_repo_name}" if project_repo_name
+          ENV['CIRCLE_WORKING_DIRECTORY']
         end
       end
     end

data/lib/knapsack_pro/repository_adapters/git_adapter.rb

@@ -17,7 +17,8 @@ module KnapsackPro
       private
 
       def working_dir
-        KnapsackPro::Config::Env.project_dir
+        dir = KnapsackPro::Config::Env.project_dir
+        File.expand_path(dir)
       end
     end
   end

data/lib/knapsack_pro/runners/base_runner.rb

@@ -35,6 +35,10 @@ module KnapsackPro
 
       attr_reader :allocator_builder,
         :allocator
+
+      def self.child_status
+        $?
+      end
     end
   end
 end

data/lib/knapsack_pro/runners/queue/base_runner.rb

@@ -29,6 +29,10 @@ module KnapsackPro
 
         attr_reader :allocator_builder,
           :allocator
+
+        def self.child_status
+          $?
+        end
       end
     end
   end

data/lib/knapsack_pro/runners/queue/cucumber_runner.rb

@@ -95,16 +95,14 @@ module KnapsackPro
           # which is defined in lib/knapsack_pro/adapters/cucumber_adapter.rb
           ENV['KNAPSACK_PRO_BEFORE_QUEUE_HOOK_CALLED'] = 'true'
 
-          process_status = $?
-
-          unless process_status.exited?
+          unless child_status.exited?
             raise "Cucumber process execution failed. It's likely that your CI server has exceeded"\
                     " its available memory. Please try changing CI config or retrying the CI build.\n"\
                     "Failed command: #{cmd}\n"\
-                    "Process status: #{process_status.inspect}"
+                    "Process status: #{child_status.inspect}"
           end
 
-          process_status.exitstatus
+          child_status.exitstatus
         end
       end
     end

data/lib/knapsack_pro/runners/queue/rspec_runner.rb

@@ -11,18 +11,14 @@ module KnapsackPro
           ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED'] = 'true'
           ENV['KNAPSACK_PRO_QUEUE_ID'] = KnapsackPro::Config::EnvGenerator.set_queue_id
 
-          runner = new(KnapsackPro::Adapters::RSpecAdapter)
+          adapter_class = KnapsackPro::Adapters::RSpecAdapter
+          runner = new(adapter_class)
 
           cli_args = (args || '').split
-
-          if KnapsackPro::Config::Env.rspec_split_by_test_examples? && has_tag_option?(cli_args)
-            error_message = 'It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature. Please see: https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it#warning-dont-use-rspec-tag-option'
-            KnapsackPro.logger.error(error_message)
-            raise error_message
-          end
+          adapter_class.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(cli_args)
 
           # when format option is not defined by user then use progress formatter to show tests execution progress
-          cli_args += ['--format', 'progress'] unless has_format_option?(cli_args)
+          cli_args += ['--format', 'progress'] unless adapter_class.has_format_option?(cli_args)
 
           cli_args += [
             # shows summary of all tests executed in Queue Mode at the very end
@@ -154,19 +150,6 @@ module KnapsackPro
             ::RSpec.configuration.reset_filters
           end
         end
-
-        def self.has_tag_option?(cli_args)
-          # use start_with? because user can define tag option in a few ways:
-          # -t mytag
-          # -tmytag
-          # --tag mytag
-          # --tag=mytag
-          cli_args.any? { |arg| arg.start_with?('-t') || arg.start_with?('--tag') }
-        end
-
-        def self.has_format_option?(cli_args)
-          cli_args.any? { |arg| arg.start_with?('-f') || arg.start_with?('--format') }
-        end
       end
     end
   end

data/lib/knapsack_pro/runners/rspec_runner.rb

@@ -11,6 +11,9 @@ module KnapsackPro
         if runner.test_files_to_execute_exist?
           adapter_class.verify_bind_method_called
 
+          cli_args = (args || '').split
+          adapter_class.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(cli_args)
+
           require 'rspec/core/rake_task'
 
           task_name = 'knapsack_pro:rspec_run'

data/lib/knapsack_pro/runners/spinach_runner.rb

@@ -13,7 +13,7 @@ module KnapsackPro
           cmd = %Q[KNAPSACK_PRO_RECORDING_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=#{ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN']} bundle exec spinach #{args} --features_path #{runner.test_dir} -- #{runner.stringify_test_file_paths}]
 
           Kernel.system(cmd)
-          Kernel.exit($?.exitstatus) unless $?.exitstatus.zero?
+          Kernel.exit(child_status.exitstatus) unless child_status.exitstatus.zero?
         end
       end
     end

data/lib/knapsack_pro/runners/test_unit_runner.rb

@@ -11,21 +11,32 @@ module KnapsackPro
         if runner.test_files_to_execute_exist?
           adapter_class.verify_bind_method_called
 
-          require 'test/unit'
-
           cli_args =
             (args || '').split +
             runner.test_file_paths.map do |f|
               File.expand_path(f)
             end
 
-          exit ::Test::Unit::AutoRunner.run(
+          exit test_unit_autorunner_run(
             true,
             runner.test_dir,
             cli_args
           )
         end
       end
+
+      private
+
+      # https://www.rubydoc.info/github/test-unit/test-unit/Test/Unit/AutoRunner#run-class_method
+      def self.test_unit_autorunner_run(force_standalone, default_dir, argv)
+        require 'test/unit'
+
+        ::Test::Unit::AutoRunner.run(
+          force_standalone,
+          default_dir,
+          argv
+        )
+      end
     end
   end
 end

data/lib/knapsack_pro/tracker.rb

@@ -19,23 +19,28 @@ module KnapsackPro
     end
 
     def start_timer
+      @start_time ||= now_without_mock_time.to_f
+    end
+
+    def reset_timer
       @start_time = now_without_mock_time.to_f
     end
 
     def stop_timer
       execution_time = @start_time ? now_without_mock_time.to_f - @start_time : 0.0
 
-      if current_test_path
+      if @current_test_path
         update_global_time(execution_time)
         update_test_file_time(execution_time)
-        @current_test_path = nil
+        reset_timer
       end
 
       execution_time
     end
 
     def current_test_path
-      KnapsackPro::TestFileCleaner.clean(@current_test_path) if @current_test_path
+      raise("current_test_path needs to be set by Knapsack Pro Adapter's bind method") unless @current_test_path
+      KnapsackPro::TestFileCleaner.clean(@current_test_path)
     end
 
     def set_prerun_tests(test_file_paths)

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '2.15.0'
+  VERSION = '2.18.1'
 end

data/spec/knapsack_pro/adapters/rspec_adapter_spec.rb

@@ -12,6 +12,104 @@ describe KnapsackPro::Adapters::RSpecAdapter do
     it_behaves_like 'adapter'
   end
 
+  describe '.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!' do
+    let(:cli_args) { double }
+
+    subject { described_class.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(cli_args) }
+
+    before do
+      expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(rspec_split_by_test_examples_enabled)
+    end
+
+    context 'when RSpec split by test examples enabled' do
+      let(:rspec_split_by_test_examples_enabled) { true }
+
+      before do
+        expect(described_class).to receive(:has_tag_option?).with(cli_args).and_return(has_tag_option)
+      end
+
+      context 'when RSpec tag option is provided' do
+        let(:has_tag_option) { true }
+
+        it do
+          expect { subject }.to raise_error(/It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature/)
+        end
+      end
+
+      context 'when RSpec tag option is not provided' do
+        let(:has_tag_option) { false }
+
+        it 'does nothing' do
+          expect(subject).to be_nil
+        end
+      end
+    end
+
+    context 'when RSpec split by test examples disabled' do
+      let(:rspec_split_by_test_examples_enabled) { false }
+
+      it 'does nothing' do
+        expect(subject).to be_nil
+      end
+    end
+  end
+
+  describe '.has_tag_option?' do
+    subject { described_class.has_tag_option?(cli_args) }
+
+    context 'when tag option is provided as -t' do
+      let(:cli_args) { ['-t', 'mytag'] }
+
+      it { expect(subject).to be true }
+    end
+
+    context 'when tag option is provided as --tag' do
+      let(:cli_args) { ['--tag', 'mytag'] }
+
+      it { expect(subject).to be true }
+    end
+
+    context 'when tag option is provided without delimiter' do
+      let(:cli_args) { ['-tmytag'] }
+
+      it { expect(subject).to be true }
+    end
+
+    context 'when tag option is not provided' do
+      let(:cli_args) { ['--fake', 'value'] }
+
+      it { expect(subject).to be false }
+    end
+  end
+
+  describe '.has_format_option?' do
+    subject { described_class.has_format_option?(cli_args) }
+
+    context 'when format option is provided as -f' do
+      let(:cli_args) { ['-f', 'documentation'] }
+
+      it { expect(subject).to be true }
+    end
+
+    context 'when format option is provided as --format' do
+      let(:cli_args) { ['--format', 'documentation'] }
+
+      it { expect(subject).to be true }
+    end
+
+    context 'when format option is provided without delimiter' do
+      let(:cli_args) { ['-fd'] }
+
+      it { expect(subject).to be true }
+    end
+
+    context 'when format option is not provided' do
+      let(:cli_args) { ['--fake', 'value'] }
+
+      it { expect(subject).to be false }
+    end
+  end
+
   describe '.test_path' do
     let(:current_example_metadata) do
       {
@@ -87,16 +185,20 @@ describe KnapsackPro::Adapters::RSpecAdapter do
 
         it 'records time for current test path' do
           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(: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)
 
-          allow(KnapsackPro).to receive(:tracker).and_return(tracker)
-          expect(tracker).to receive(:start_timer).ordered
           expect(tracker).to receive(:current_test_path=).with(test_path).ordered
 
           expect(example).to receive(:run)
@@ -127,16 +229,20 @@ describe KnapsackPro::Adapters::RSpecAdapter do
             expect(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(: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)
 
-            allow(KnapsackPro).to receive(:tracker).and_return(tracker)
-            expect(tracker).to receive(:start_timer).ordered
             expect(tracker).to receive(:current_test_path=).with(test_example_path).ordered
 
             expect(example).to receive(:run)
@@ -158,6 +264,10 @@ describe KnapsackPro::Adapters::RSpecAdapter do
 
           it 'records time for current test path' do
             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(:append_after).with(:context).and_yield
             expect(config).to receive(:after).with(:suite).and_yield
@@ -166,8 +276,8 @@ describe KnapsackPro::Adapters::RSpecAdapter do
             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)
 
-            allow(KnapsackPro).to receive(:tracker).and_return(tracker)
-            expect(tracker).to receive(:start_timer).ordered
+            expect(tracker).to receive(:stop_timer).ordered
+
             expect(tracker).to receive(:current_test_path=).with(test_path).ordered
 
             expect(example).to receive(:run)

data/spec/knapsack_pro/adapters/test_unit_adapter_spec.rb

@@ -1,4 +1,11 @@
-require 'test/unit/testcase'
+# fake class to make tests pass and to avoid require 'test/unit/testcase' to not break RSpec
+# https://www.rubydoc.info/gems/test-unit/3.4.1/Test/Unit/TestSuite
+module Test
+  module Unit
+    class TestSuite
+    end
+  end
+end
 
 describe KnapsackPro::Adapters::TestUnitAdapter do
   it do

data/spec/knapsack_pro/config/ci/circle_spec.rb

@@ -75,9 +75,9 @@ describe KnapsackPro::Config::CI::Circle do
   describe '#project_dir' do
     subject { described_class.new.project_dir }
 
-    context 'when environment exists' do
-      let(:env) { { 'CIRCLE_PROJECT_REPONAME' => 'knapsack_pro-ruby' } }
-      it { should eql '/home/ubuntu/knapsack_pro-ruby' }
+    context 'when CIRCLE_WORKING_DIRECTORY environment variable exists' do
+      let(:env) { { 'CIRCLE_WORKING_DIRECTORY' => '~/knapsack_pro-ruby' } }
+      it { should eql '~/knapsack_pro-ruby' }
     end
 
     context "when environment doesn't exist" do

data/spec/knapsack_pro/repository_adapters/git_adapter_spec.rb

@@ -15,20 +15,20 @@ describe KnapsackPro::RepositoryAdapters::GitAdapter do
 
     it { should_not be_nil }
     its(:size) { should eq 40 }
-    it { should eq circle_sha1 } if ENV['CIRCLE_SHA1']
+    it { should eq circle_sha1 } if ENV['CIRCLECI']
   end
 
   describe '#branch' do
     subject { described_class.new.branch }
 
     it { should_not be_nil }
-    it { should eq circle_branch } if ENV['CIRCLE_BRANCH']
+    it { should eq circle_branch } if ENV['CIRCLECI']
   end
 
   describe '#branches' do
     subject { described_class.new.branches }
 
     it { expect(subject.include?('master')).to be true }
-    it { expect(subject.include?(circle_branch)).to be true } if ENV['CIRCLE_BRANCH']
+    it { expect(subject.include?(circle_branch)).to be true } if ENV['CIRCLECI']
   end
 end

data/spec/knapsack_pro/runners/queue/cucumber_runner_spec.rb

@@ -100,6 +100,7 @@ describe KnapsackPro::Runners::Queue::CucumberRunner do
 
     context 'when test files exist' do
       let(:test_file_paths) { ['features/a.feature', 'features/b.feature'] }
+      let(:child_status) { double }
 
       before do
         subset_queue_id = 'fake-subset-queue-id'
@@ -117,8 +118,9 @@ describe KnapsackPro::Runners::Queue::CucumberRunner do
 
         expect(ENV).to receive(:[]=).with('KNAPSACK_PRO_BEFORE_QUEUE_HOOK_CALLED', 'true')
 
-        expect($?).to receive(:exited?).and_return(process_exited)
-        allow($?).to receive(:exitstatus).and_return(exitstatus)
+        allow(described_class).to receive(:child_status).and_return(child_status)
+        expect(child_status).to receive(:exited?).and_return(process_exited)
+        allow(child_status).to receive(:exitstatus).and_return(exitstatus)
       end
 
       context 'when system process finished its work (exited)' do

data/spec/knapsack_pro/runners/queue/rspec_runner_spec.rb

@@ -133,31 +133,16 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
       context 'when RSpec split by test examples feature is enabled' do
         before do
           expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(true)
+          expect(KnapsackPro::Adapters::RSpecAdapter).to receive(:ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!).and_call_original
         end
 
-        context 'when tag option is provided as --tag' do
+        context 'when tag option is provided' do
           let(:args) { '--tag example-value' }
 
           it do
             expect { subject }.to raise_error(/It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature/)
           end
         end
-
-        context 'when tag option is provided as -t' do
-          let(:args) { '-t example-value' }
-
-          it do
-            expect { subject }.to raise_error(/It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature/)
-          end
-        end
-
-        context 'when tag option is provided without delimiter' do
-          let(:args) { '-texample-value' }
-
-          it do
-            expect { subject }.to raise_error(/It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature/)
-          end
-        end
       end
     end
 

data/spec/knapsack_pro/runners/rspec_runner_spec.rb

@@ -34,7 +34,8 @@ describe KnapsackPro::Runners::RSpecRunner do
       let(:task) { double }
 
       before do
-        expect(KnapsackPro::Adapters::RSpecAdapter).to receive(:verify_bind_method_called)
+        expect(KnapsackPro::Adapters::RSpecAdapter).to receive(:verify_bind_method_called).ordered
+        expect(KnapsackPro::Adapters::RSpecAdapter).to receive(:ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!).with(['--profile', '--color']).ordered
 
         expect(Rake::Task).to receive(:[]).with('knapsack_pro:rspec_run').at_least(1).and_return(task)
 
@@ -44,7 +45,7 @@ describe KnapsackPro::Runners::RSpecRunner do
         expect(t).to receive(:pattern=).with([])
       end
 
-      context 'when task already exists' do
+      context 'when rake task already exists' do
         before do
           expect(Rake::Task).to receive(:task_defined?).with('knapsack_pro:rspec_run').and_return(true)
           expect(task).to receive(:clear)
@@ -57,7 +58,7 @@ describe KnapsackPro::Runners::RSpecRunner do
         end
       end
 
-      context "when task doesn't exist" do
+      context "when rake task doesn't exist" do
         before do
           expect(Rake::Task).to receive(:task_defined?).with('knapsack_pro:rspec_run').and_return(false)
           expect(task).not_to receive(:clear)

data/spec/knapsack_pro/runners/spinach_runner_spec.rb

@@ -24,11 +24,14 @@ describe KnapsackPro::Runners::SpinachRunner do
                         stringify_test_file_paths: stringify_test_file_paths,
                         test_files_to_execute_exist?: true)
       end
+      let(:child_status) { double }
 
       before do
         expect(KnapsackPro::Adapters::SpinachAdapter).to receive(:verify_bind_method_called)
 
         expect(Kernel).to receive(:system).with('KNAPSACK_PRO_RECORDING_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=spinach-token bundle exec spinach --custom-arg --features_path fake-test-dir -- features/a.feature features/b.feature')
+
+        allow(described_class).to receive(:child_status).and_return(child_status)
       end
 
       after { subject }
@@ -37,7 +40,7 @@ describe KnapsackPro::Runners::SpinachRunner do
         let(:exitstatus) { 0 }
 
         before do
-          expect($?).to receive(:exitstatus).and_return(exitstatus)
+          expect(child_status).to receive(:exitstatus).and_return(exitstatus)
         end
 
         it do
@@ -49,7 +52,7 @@ describe KnapsackPro::Runners::SpinachRunner do
         let(:exitstatus) { 1 }
 
         before do
-          expect($?).to receive(:exitstatus).twice.and_return(exitstatus)
+          expect(child_status).to receive(:exitstatus).twice.and_return(exitstatus)
         end
 
         it do

data/spec/knapsack_pro/runners/test_unit_runner_spec.rb

@@ -1,5 +1,3 @@
-require 'test/unit'
-
 describe KnapsackPro::Runners::TestUnitRunner do
   subject { described_class.new(KnapsackPro::Adapters::TestUnitAdapter) }
 
@@ -27,7 +25,7 @@ describe KnapsackPro::Runners::TestUnitRunner do
         .with(KnapsackPro::Adapters::TestUnitAdapter).and_return(runner)
 
         auto_runner_exit_code = 0
-        expect(Test::Unit::AutoRunner).to receive(:run) do |flag, test_dir, cli_args|
+        expect(described_class).to receive(:test_unit_autorunner_run) do |flag, test_dir, cli_args|
           expect(flag).to be true
           expect(test_dir).to eq 'test-unit_fake'
           expect(cli_args.size).to eq 4

data/spec/knapsack_pro/tracker_spec.rb

@@ -12,7 +12,9 @@ describe KnapsackPro::Tracker do
     subject { tracker.current_test_path }
 
     context 'when current_test_path not set' do
-      it { expect(subject).to be_nil }
+      it do
+        expect { subject }.to raise_error("current_test_path needs to be set by Knapsack Pro Adapter's bind method")
+      end
     end
 
     context 'when current_test_path set' do
@@ -56,9 +58,6 @@ describe KnapsackPro::Tracker do
       it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
       it { expect(tracker.test_files_with_time['a_spec.rb'][:time_execution]).to be_within(delta).of(0.1) }
       it { expect(tracker.test_files_with_time['b_spec.rb'][:time_execution]).to be_within(delta).of(0.2) }
-      it 'resets current_test_path after time is measured' do
-        expect(tracker.current_test_path).to be_nil
-      end
       it_behaves_like '#to_a'
     end
 
@@ -84,9 +83,6 @@ describe KnapsackPro::Tracker do
       it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
       it { expect(tracker.test_files_with_time['a_spec.rb'][:time_execution]).to be_within(delta).of(0) }
       it { expect(tracker.test_files_with_time['b_spec.rb'][:time_execution]).to be_within(delta).of(0) }
-      it 'resets current_test_path after time is measured' do
-        expect(tracker.current_test_path).to be_nil
-      end
       it_behaves_like '#to_a'
     end
 
@@ -99,10 +95,12 @@ describe KnapsackPro::Tracker do
         end
       end
 
-      it { expect(tracker.global_time).to eq 0 }
+      it { expect(tracker.global_time).to be > 0 }
       it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
       it { expect(tracker.test_files_with_time['a_spec.rb'][:time_execution]).to eq 0 }
-      it { expect(tracker.test_files_with_time['b_spec.rb'][:time_execution]).to eq 0 }
+      it '2nd spec (b_spec.rb) should have recorded time execution - because start_time was set during first call of stop_timer for the first spec (a_spec.rb)' do
+        expect(tracker.test_files_with_time['b_spec.rb'][:time_execution]).to be > 0
+      end
       it_behaves_like '#to_a'
     end
   end

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ require 'spinach'
 require 'timecop'
 Timecop.safe_mode = true
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 require 'vcr'
 require 'webmock/rspec'
 VCR.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.18.1
 platform: ruby
 authors:
 - ArturT
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,36 +42,36 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
     - - "~>"
       - !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
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
     - - "~>"
       - !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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -160,44 +146,44 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.9.4
 description: Run tests in parallel across CI server nodes based on tests execution
   time. Split tests in a dynamic way to ensure parallel jobs are done at a similar
   time. Thanks to that your CI build time is as fast as possible. It works with many
@@ -423,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel