knapsack_pro 2.2.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b399cf5cff114341276acbcc1c9c372ff4bfb51ffc05a5ee5b59cf531dc64feb
-  data.tar.gz: aed0dea9791ab8589c63192e53b3f64c2a071f690553bc0d450be61d20b51b1e
+  metadata.gz: b4167b51e7f0af27a7d1482efb7a6c019f9aa99dd849f9488e47c4a33b5bd943
+  data.tar.gz: fff1d5e557813cd2829298c422d4ffae857e047d27aa001cf746a516270d9259
 SHA512:
-  metadata.gz: d44d7d00c68d618d7ec41b764b28a8bcd7e5f2c62329d7246f2ee760f0d956ce7f1ffbbf6e8fae2adedf3cbd62d83a255f0b89a1dff9c8cc216d42cd11a89603
-  data.tar.gz: 403cbc599ff70473aa07ae92abb73016a942c3ed21a2bbcb376ade1e8d0fe62e1ea64677fd6527c5a2b8822bd65fa7c6139ffb6c0850f273b795303974724bab
+  metadata.gz: fd9b442c01b5b58b295e6fc36d3879ddbf97b8770d4f96243f594f225ef3f73e23e75555cfba7adb6439dd5afa39a38ea756e5758628eed54c9305a12bd8b716
+  data.tar.gz: 7401c76f35ce8485a7dc8dc5742514803c8a045d7f431899b32aaa4795433b723b68e554386b7670abb367b1f9dfde2be9e4bc8b661ead354dbab366b56c1705

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Change Log
 
+### 2.6.0
+
+* Improve logger to show failed requests URL and when retry will happen
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/127
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.5.0...v2.6.0
+
+### 2.5.0
+
+* Add production branch to non encryptable branches names
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/126
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.4.0...v2.5.0
+
+### 2.4.0
+
+* Update list of non encryptable branches
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/125
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.3.0...v2.4.0
+
+### 2.3.0
+
+* When you use Regular Mode then try 6 attempts to connect to the API instead of 3 attempts
+
+    Add `KNAPSACK_PRO_MAX_REQUEST_RETRIES` environment variable to let user define their own number of request retries to the API. It is useful to set it to `0` for [forked repos](https://knapsackpro.com/faq/question/how-to-make-knapsack_pro-works-for-forked-repositories-of-my-project) when you want to rely on Fallback Mode.
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/124
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.2.1...v2.3.0
+
+### 2.2.1
+
+* Improve detection of test file path in test-unit runner for test files with shared examples
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/123
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.2.0...v2.2.1
+
 ### 2.2.0
 
 * Allow defining Queue Mode hooks multiple times (`KnapsackPro::Hooks::Queue.before_queue`, `KnapsackPro::Hooks::Queue.after_subset_queue`, `KnapsackPro::Hooks::Queue.after_queue`)

data/README.md

@@ -2320,11 +2320,19 @@ There are a few ways to reproduce tests executed on CI node in your development
 
 ##### for knapsack_pro regular mode
 
-knapsack_pro gem will retry requests to Knapsack Pro API multiple times every few seconds til it switch to fallback behavior and it will split test files across CI nodes based on popular test directory names. When knapsack_pro starts fallback mode then you will see a warning in the output.
+knapsack_pro gem will retry requests to Knapsack Pro API multiple times every few seconds till it switches to fallback behavior (Fallback Mode) and it will split test files across CI nodes based on popular test directory names. When knapsack_pro starts Fallback Mode then you will see a warning in the output.
+
+Note there is an unlikely scenario when some of the CI nodes may start in Fallback Mode but others don't and then it could happen that some of test files might be skipped. You should [read this to learn more](https://github.com/KnapsackPro/knapsack_pro-ruby/pull/124) and decide if you like to use Fallback Mode when running tests with knapsack_pro Regular Mode.
+
+If your CI provider allows to retry only one of parallel CI nodes then please [read about this edge case as well](#required-ci-configuration-if-you-use-retry-single-failed-ci-node-feature-on-your-ci-server-when-knapsack_pro_fixed_queue_splittrue-in-queue-mode-or-knapsack_pro_fixed_test_suite_splittrue-in-regular-mode).
 
 ##### for knapsack_pro queue mode
 
-knapsack_pro gem will retry requests to Knapsack Pro API multiple times every few seconds till it switches to fallback behavior and it will split test files across CI nodes based on popular test directory names. Note that if one of CI nodes will lose connection to Knapsack Pro API but other not then you may see that some of the test files will be executed on multiple CI nodes. Fallback mode guarantees each of test files is run at least once across CI nodes. Thanks to that we know if the whole test suite is green or not. When knapsack_pro starts fallback mode then you will see a warning in the output.
+knapsack_pro gem will retry requests to Knapsack Pro API multiple times every few seconds till it switches to fallback behavior (Fallback Mode) and it will split test files across CI nodes based on popular test directory names.
+
+Note that if one of the CI nodes loses connection to Knapsack Pro API but others don't, then some of the test files may be executed on multiple CI nodes. **Fallback Mode guarantees each of the test files is run at least once across CI nodes when you use knapsack_pro in Queue Mode.** Thanks to that we know if the whole test suite is green or not. When knapsack_pro starts Fallback Mode then you will see a warning in the output.
+
+If your CI provider allows to retry only one of parallel CI nodes then please [read about this edge case as well](#required-ci-configuration-if-you-use-retry-single-failed-ci-node-feature-on-your-ci-server-when-knapsack_pro_fixed_queue_splittrue-in-queue-mode-or-knapsack_pro_fixed_test_suite_splittrue-in-regular-mode).
 
 #### How can I change log level?
 
@@ -2464,12 +2472,13 @@ Below example is for rspec. You can change `$KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC
 if [ "$KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC" = "" ]; then
   KNAPSACK_PRO_ENDPOINT=https://api-disabled-for-fork.knapsackpro.com \
     KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC=disabled-for-fork \
+    KNAPSACK_PRO_MAX_REQUEST_RETRIES=0 \
     bundle exec rake knapsack_pro:rspec # use Regular Mode here always
 else
     # Regular Mode
     bundle exec rake knapsack_pro:rspec
 
-    # You can use Queue Mode instead of Regular Mode if you like
+    # or you can use Queue Mode instead of Regular Mode if you like
     # bundle exec rake knapsack_pro:queue:rspec
 fi
 ```
@@ -3249,6 +3258,8 @@ $ gem build knapsack_pro.gemspec
 $ gem push knapsack_pro-X.X.X.gem
 ```
 
+Update the latest available gem version in `TestSuiteClientVersionChecker` for the Knapsack Pro API repository.
+
 ## Mentions
 
 List of articles where people mentioned Knapsack Pro:

data/lib/knapsack_pro/adapters/test_unit_adapter.rb

@@ -5,9 +5,29 @@ module KnapsackPro
       @@parent_of_test_dir = nil
 
       def self.test_path(obj)
-        first_test = obj.tests.first
-        method = first_test.method_name
-        full_test_path = first_test.method(method).source_location.first
+        full_test_path = nil
+        found_valid_test_file_path = false
+
+        obj.tests.each do |test_obj|
+          method = test_obj.method_name
+          full_test_path = test_obj.method(method).source_location.first
+          # if we find a test file path that is a valid test file path within test suite directory
+          # then break to stop looking further.
+          # If we won't find a valid test file path then the last found path will be used as full_test_path
+          # For instance if test file contains only shared examples then it's not possible to properly detect test file path
+          # so the wrong path can be used like:
+          # /Users/artur/.rvm/gems/ruby-2.6.5/gems/shared_should-0.10.0/lib/shared_should/shared_context.rb
+          if full_test_path.include?(@@parent_of_test_dir)
+            found_valid_test_file_path = true
+            break
+          end
+        end
+
+        unless found_valid_test_file_path
+          KnapsackPro.logger.warn('cannot detect a valid test file path. Probably the test file contains only shared examples. Please add test cases to your test file. Read more at https://github.com/KnapsackPro/knapsack_pro-ruby/pull/123')
+          KnapsackPro.logger.warn("See test file for #{obj.inspect}")
+        end
+
         parent_of_test_dir_regexp = Regexp.new("^#{@@parent_of_test_dir}")
         test_path = full_test_path.gsub(parent_of_test_dir_regexp, '.')
         # test_path will look like ./test/dir/unit_test.rb

data/lib/knapsack_pro/client/connection.rb

@@ -4,7 +4,6 @@ module KnapsackPro
       class ServerError < StandardError; end
 
       TIMEOUT = 15
-      MAX_RETRY = -> { KnapsackPro::Config::Env.fallback_mode_enabled? ? 3 : 6 }
       REQUEST_RETRY_TIMEBOX = 8
 
       def initialize(action)
@@ -116,14 +115,19 @@ module KnapsackPro
 
         response_body
       rescue ServerError, Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::EPIPE, EOFError, SocketError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError => e
+        logger.warn("#{action.http_method.to_s.upcase} #{endpoint_url}")
+        logger.warn('Request failed due to:')
         logger.warn(e.inspect)
         retries += 1
-        if retries < MAX_RETRY.call
+        if retries < max_request_retries
           wait = retries * REQUEST_RETRY_TIMEBOX
-          logger.warn("Wait #{wait}s and retry request to Knapsack Pro API.")
           print_every = 2 # seconds
           (wait / print_every).ceil.times do |i|
-            logger.warn("Next request in #{wait - i * print_every}s...")
+            if i == 0
+              logger.warn("Wait for #{wait}s before retrying the request to Knapsack Pro API.")
+            else
+              logger.warn("#{wait - i * print_every}s left before retry...")
+            end
             Kernel.sleep(print_every)
           end
           retry
@@ -156,6 +160,22 @@ module KnapsackPro
           http.get(uri, json_headers)
         end
       end
+
+      def max_request_retries
+        # when user defined max request retries
+        return KnapsackPro::Config::Env.max_request_retries if KnapsackPro::Config::Env.max_request_retries
+
+        # when Fallback Mode is disabled then try more attempts to connect to the API
+        return 6 unless KnapsackPro::Config::Env.fallback_mode_enabled?
+
+        # when Regular Mode then try more attempts to connect to the API
+        # if only one CI node starts Fallback Mode instead of all then we can't guarantee all test files will be run
+        # https://github.com/KnapsackPro/knapsack_pro-ruby/pull/124
+        return 6 if KnapsackPro::Config::Env.regular_mode?
+
+        # default number of attempts
+        3
+      end
     end
   end
 end

data/lib/knapsack_pro/config/env.rb

@@ -36,6 +36,13 @@ module KnapsackPro
           ).to_i
         end
 
+        def max_request_retries
+          number = ENV['KNAPSACK_PRO_MAX_REQUEST_RETRIES']
+          if number
+            number.to_i
+          end
+        end
+
         def commit_hash
           ENV['KNAPSACK_PRO_COMMIT_HASH'] ||
             ci_env_for(:commit_hash)
@@ -83,6 +90,10 @@ module KnapsackPro
           recording_enabled == 'true'
         end
 
+        def regular_mode?
+          recording_enabled?
+        end
+
         def queue_recording_enabled
           ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED']
         end

data/lib/knapsack_pro/crypto/branch_encryptor.rb

@@ -1,7 +1,23 @@
 module KnapsackPro
   module Crypto
     class BranchEncryptor
-      NON_ENCRYPTABLE_BRANCHES = %w(develop development dev master staging)
+      NON_ENCRYPTABLE_BRANCHES = [
+        'master',
+        'main',
+        'develop',
+        'development',
+        'dev',
+        'staging',
+        'production',
+        # GitHub Actions has branch names starting with refs/heads/
+        'refs/heads/master',
+        'refs/heads/main',
+        'refs/heads/develop',
+        'refs/heads/development',
+        'refs/heads/dev',
+        'refs/heads/staging',
+        'refs/heads/production',
+      ]
 
       def self.call(branch)
         if KnapsackPro::Config::Env.branch_encrypted?

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '2.2.0'
+  VERSION = '2.6.0'
 end

data/spec/knapsack_pro/adapters/test_unit_adapter_spec.rb

@@ -10,8 +10,7 @@ describe KnapsackPro::Adapters::TestUnitAdapter do
 
     before do
       parent_of_test_dir = File.expand_path('../../../', File.dirname(__FILE__))
-      parent_of_test_dir_regexp = Regexp.new("^#{parent_of_test_dir}")
-      described_class.class_variable_set(:@@parent_of_test_dir, parent_of_test_dir_regexp)
+      described_class.class_variable_set(:@@parent_of_test_dir, parent_of_test_dir)
     end
 
     context 'when regular test' do

data/spec/knapsack_pro/client/connection_spec.rb

@@ -84,22 +84,22 @@ shared_examples 'when retry request' do
       expect(logger).to receive(:error).exactly(3).with(parsed_response)
 
       server_error = described_class::ServerError.new(parsed_response)
+      expect(logger).to receive(:warn).exactly(3).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+      expect(logger).to receive(:warn).exactly(3).with('Request failed due to:')
       expect(logger).to receive(:warn).exactly(3).with(server_error.inspect)
 
-      expect(logger).to receive(:warn).with("Wait 8s and retry request to Knapsack Pro API.")
-      expect(logger).to receive(:warn).with("Next request in 8s...")
-      expect(logger).to receive(:warn).with("Next request in 6s...")
-      expect(logger).to receive(:warn).with("Next request in 4s...")
-      expect(logger).to receive(:warn).with("Next request in 2s...")
-      expect(logger).to receive(:warn).with("Wait 16s and retry request to Knapsack Pro API.")
-      expect(logger).to receive(:warn).with("Next request in 16s...")
-      expect(logger).to receive(:warn).with("Next request in 14s...")
-      expect(logger).to receive(:warn).with("Next request in 12s...")
-      expect(logger).to receive(:warn).with("Next request in 10s...")
-      expect(logger).to receive(:warn).with("Next request in 8s...")
-      expect(logger).to receive(:warn).with("Next request in 6s...")
-      expect(logger).to receive(:warn).with("Next request in 4s...")
-      expect(logger).to receive(:warn).with("Next request in 2s...")
+      expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("6s left before retry...")
+      expect(logger).to receive(:warn).with("4s left before retry...")
+      expect(logger).to receive(:warn).with("2s left before retry...")
+      expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("14s left before retry...")
+      expect(logger).to receive(:warn).with("12s left before retry...")
+      expect(logger).to receive(:warn).with("10s left before retry...")
+      expect(logger).to receive(:warn).with("8s left before retry...")
+      expect(logger).to receive(:warn).with("6s left before retry...")
+      expect(logger).to receive(:warn).with("4s left before retry...")
+      expect(logger).to receive(:warn).with("2s left before retry...")
       expect(Kernel).to receive(:sleep).exactly(12).with(2)
 
       expect(subject).to eq(parsed_response)
@@ -108,6 +108,53 @@ shared_examples 'when retry request' do
       expect(connection.errors?).to be true
     end
 
+    context 'when max request retries defined' do
+      before do
+        expect(KnapsackPro::Config::Env).to receive(:max_request_retries).at_least(1).and_return(4)
+      end
+
+      it do
+        expect(logger).to receive(:debug).exactly(4).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:debug).exactly(4).with('API request UUID: fake-uuid')
+        expect(logger).to receive(:debug).exactly(4).with('API response:')
+
+        parsed_response = { 'error' => 'Internal Server Error' }
+
+        expect(logger).to receive(:error).exactly(4).with(parsed_response)
+
+        server_error = described_class::ServerError.new(parsed_response)
+        expect(logger).to receive(:warn).exactly(4).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:warn).exactly(4).with('Request failed due to:')
+        expect(logger).to receive(:warn).exactly(4).with(server_error.inspect)
+
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("14s left before retry...")
+        expect(logger).to receive(:warn).with("12s left before retry...")
+        expect(logger).to receive(:warn).with("10s left before retry...")
+        expect(logger).to receive(:warn).with("8s left before retry...")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        11.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
+        end
+
+        expect(Kernel).to receive(:sleep).exactly(4+8+12).with(2)
+
+        expect(subject).to eq(parsed_response)
+
+        expect(connection.success?).to be false
+        expect(connection.errors?).to be true
+      end
+    end
+
     context 'when Fallback Mode is disabled' do
       before do
         expect(KnapsackPro::Config::Env).to receive(:fallback_mode_enabled?).at_least(1).and_return(false)
@@ -123,37 +170,94 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:error).exactly(6).with(parsed_response)
 
         server_error = described_class::ServerError.new(parsed_response)
+        expect(logger).to receive(:warn).exactly(6).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:warn).exactly(6).with('Request failed due to:')
+        expect(logger).to receive(:warn).exactly(6).with(server_error.inspect)
+
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("14s left before retry...")
+        expect(logger).to receive(:warn).with("12s left before retry...")
+        expect(logger).to receive(:warn).with("10s left before retry...")
+        expect(logger).to receive(:warn).with("8s left before retry...")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        11.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
+        end
+
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to Knapsack Pro API.")
+        15.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
+        end
+
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to Knapsack Pro API.")
+        19.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
+        end
+
+        expect(Kernel).to receive(:sleep).exactly(60).with(2)
+
+        expect(subject).to eq(parsed_response)
+
+        expect(connection.success?).to be false
+        expect(connection.errors?).to be true
+      end
+    end
+
+    context 'when Regular Mode' do
+      before do
+        expect(KnapsackPro::Config::Env).to receive(:regular_mode?).at_least(1).and_return(true)
+      end
+
+      it do
+        expect(logger).to receive(:debug).exactly(6).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:debug).exactly(6).with('API request UUID: fake-uuid')
+        expect(logger).to receive(:debug).exactly(6).with('API response:')
+
+        parsed_response = { 'error' => 'Internal Server Error' }
+
+        expect(logger).to receive(:error).exactly(6).with(parsed_response)
+
+        server_error = described_class::ServerError.new(parsed_response)
+        expect(logger).to receive(:warn).exactly(6).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:warn).exactly(6).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(6).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait 8s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 16s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 16s...")
-        expect(logger).to receive(:warn).with("Next request in 14s...")
-        expect(logger).to receive(:warn).with("Next request in 12s...")
-        expect(logger).to receive(:warn).with("Next request in 10s...")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 24s and retry request to Knapsack Pro API.")
-        12.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("14s left before retry...")
+        expect(logger).to receive(:warn).with("12s left before retry...")
+        expect(logger).to receive(:warn).with("10s left before retry...")
+        expect(logger).to receive(:warn).with("8s left before retry...")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        11.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait 32s and retry request to Knapsack Pro API.")
-        16.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to Knapsack Pro API.")
+        15.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait 40s and retry request to Knapsack Pro API.")
-        20.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to Knapsack Pro API.")
+        19.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
         expect(Kernel).to receive(:sleep).exactly(60).with(2)

data/spec/knapsack_pro/config/env_spec.rb

@@ -100,6 +100,19 @@ describe KnapsackPro::Config::Env do
     end
   end
 
+  describe '.max_request_retries' do
+    subject { described_class.max_request_retries }
+
+    context 'when ENV exists' do
+      before { stub_const("ENV", { 'KNAPSACK_PRO_MAX_REQUEST_RETRIES' => '2' }) }
+      it { should eq 2 }
+    end
+
+    context "when ENV doesn't exist" do
+      it { should be_nil }
+    end
+  end
+
   describe '.commit_hash' do
     subject { described_class.commit_hash }
 
@@ -267,6 +280,25 @@ describe KnapsackPro::Config::Env do
     end
   end
 
+
+  describe '.regular_mode?' do
+    subject { described_class.regular_mode? }
+
+    before do
+      expect(described_class).to receive(:recording_enabled?).and_return(recording_enabled)
+    end
+
+    context 'when recording is enabled' do
+      let(:recording_enabled) { true }
+      it { should be true }
+    end
+
+    context 'when recording is not enabled' do
+      let(:recording_enabled) { false }
+      it { should be false }
+    end
+  end
+
   describe '.recording_enabled?' do
     subject { described_class.recording_enabled? }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.6.0
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake