knapsack_pro 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824a069d97efb456cec01426d85ebee23d4eba646620483a09def750fba06007
-  data.tar.gz: 4c0bd1456766af5889562764590862d64626399e12d9af184343c1c6eabd4cb7
+  metadata.gz: f06c380d215524276faa79157268a701ca58e3e0ab22fdcfb78119786596bf65
+  data.tar.gz: e5c3d4a9258fd43dd869367bd7d1fdaacd786904f67cfe4041f2fc7aa49daf25
 SHA512:
-  metadata.gz: 3b557f2efc472c09108e33c7c9ef612a141986a79d7e1969a5bbea198d57341b3ac2c8a9e76a1ab8767993922405a813eac545fcaf23d1e28986ff3c9e5d586e
-  data.tar.gz: ae5853cec21a9453fa290c26ac90eebce49231848edd5b638a5cdea58a9f897f9f2bcac82c26ac953b57f53ef327e66bceebe2c67e79e36cc0a6f6d8b96d0ff4
+  metadata.gz: ad9e73fca6cb2b53d8c9d156a012ea43c159cb37380c8c6cbe95f2ee0d94abca8707ea94eff3c59d428e48afdd9f3500f28aff8f5d85d12f7fe22e7f726cf9ca
+  data.tar.gz: 2d1b257cade9a1c82e93c530a9d30cb292c05a3df007ed5e18e809472520d035590ec06b6457790ce4f37190c28beb60801c21a6a646e2ac3674abaf3c299ea1

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 1.20.0
+
+* Add support for tests split by test examples to RSpec older than 3.6.0
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/104
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v1.19.0...v1.20.0
+
 ### 1.19.0
 
 * RSpec split test files by test examples (by individual `it`s)

data/README.md

@@ -608,7 +608,9 @@ This is helpful when you have one or a few very slow test files that are a bottl
 
 ### RSpec split test files by test examples (by individual `it`s)
 
-In order to split RSpec test files by test examples across parallel CI nodes you need to set flag:
+__Requirement:__ It works with >= RSpec 3.6.0.
+
+In order to split RSpec test files by test examples across parallel CI nodes you need to set environment variable:
 
 ```
 KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES=true
@@ -1002,7 +1004,7 @@ env:
     - KNAPSACK_PRO_TEST_SUITE_TOKEN_SPINACH=spinach-token
 
     - KNAPSACK_PRO_CI_NODE_TOTAL=2
-  matrix:
+  jobs:
     - KNAPSACK_PRO_CI_NODE_INDEX=0
     - KNAPSACK_PRO_CI_NODE_INDEX=1
 ```

data/lib/knapsack_pro/formatters/rspec_json_formatter.rb

@@ -0,0 +1,20 @@
+RSpec::Support.require_rspec_core('formatters/json_formatter')
+
+# based on https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/formatters/json_formatter.rb
+module KnapsackPro
+  module Formatters
+    class RSpecJsonFormatter < RSpec::Core::Formatters::JsonFormatter
+      RSpec::Core::Formatters.register self, :message, :dump_summary, :dump_profile, :stop, :seed, :close
+
+      private
+
+      # add example.id to json report to support < RSpec 3.6.0
+      # based on https://github.com/rspec/rspec-core/pull/2369/files
+      def format_example(example)
+        super.merge({
+          :id => example.id,
+        })
+      end
+    end
+  end
+end

data/lib/knapsack_pro/test_case_detectors/rspec_test_example_detector.rb

@@ -7,14 +7,21 @@ module KnapsackPro
       def generate_json_report
         require 'rspec/core'
 
+        cli_format =
+          if Gem::Version.new(RSpec::Core::Version::STRING) < Gem::Version.new('3.6.0')
+            require_relative '../formatters/rspec_json_formatter'
+            ['--format', KnapsackPro::Formatters::RSpecJsonFormatter.to_s]
+          else
+            ['--format', 'json']
+          end
+
         ensure_report_dir_exists
         remove_old_json_report
 
         test_file_paths = KnapsackPro::TestFileFinder.call(test_file_pattern)
 
-        cli_args = [
+        cli_args = cli_format + [
           '--dry-run',
-          '--format', 'json',
           '--out', REPORT_PATH,
           '--default-path', test_dir,
         ] + test_file_paths.map { |t| t.fetch('path') }

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '1.19.0'
+  VERSION = '1.20.0'
 end

data/spec/knapsack_pro/test_case_detectors/rspec_test_example_detector_spec.rb

@@ -27,8 +27,8 @@ describe KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector do
 
       options = double
       expect(RSpec::Core::ConfigurationOptions).to receive(:new).with([
+        '--format', expected_format,
         '--dry-run',
-        '--format', 'json',
         '--out', report_path,
         '--default-path', test_dir,
         'spec/a_spec.rb', 'spec/b_spec.rb',
@@ -39,20 +39,38 @@ describe KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector do
       expect(rspec_core_runner).to receive(:run).with($stderr, $stdout).and_return(exit_code)
     end
 
-    context 'when exit code from RSpec::Core::Runner is 0' do
-      let(:exit_code) { 0 }
+    shared_examples 'generate_json_report runs RSpec::Core::Runner' do
+      context 'when exit code from RSpec::Core::Runner is 0' do
+        let(:exit_code) { 0 }
 
-      it do
-        expect(subject).to be_nil
+        it do
+          expect(subject).to be_nil
+        end
+      end
+
+      context 'when exit code from RSpec::Core::Runner is 1' do
+        let(:exit_code) { 1 }
+
+        it do
+          expect { subject }.to raise_error(RuntimeError, 'There was problem to generate test examples for test suite')
+        end
       end
     end
 
-    context 'when exit code from RSpec::Core::Runner is 1' do
-      let(:exit_code) { 1 }
+    context 'when RSpec >= 3.6.0' do
+      let(:expected_format) { 'json' }
 
-      it do
-        expect { subject }.to raise_error(RuntimeError, 'There was problem to generate test examples for test suite')
+      it_behaves_like 'generate_json_report runs RSpec::Core::Runner'
+    end
+
+    context 'when RSpec < 3.6.0' do
+      let(:expected_format) { 'KnapsackPro::Formatters::RSpecJsonFormatter' }
+
+      before do
+        stub_const('RSpec::Core::Version::STRING', '3.5.0')
       end
+
+      it_behaves_like 'generate_json_report runs RSpec::Core::Runner'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -257,6 +257,7 @@ files:
 - lib/knapsack_pro/crypto/digestor.rb
 - lib/knapsack_pro/crypto/encryptor.rb
 - lib/knapsack_pro/extensions/time.rb
+- lib/knapsack_pro/formatters/rspec_json_formatter.rb
 - lib/knapsack_pro/formatters/rspec_queue_profile_formatter_extension.rb
 - lib/knapsack_pro/formatters/rspec_queue_summary_formatter.rb
 - lib/knapsack_pro/hooks/queue.rb