knapsack_pro 8.3.3 → 9.0.0

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

@@ -137,22 +137,22 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       actual = subject
 
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] Queue Mode enabled.')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: Queue Mode enabled.')
 
       expect(actual.stdout).to include('A1 test example')
       expect(actual.stdout).to include('B1 test example')
       expect(actual.stdout).to include('C1 test example')
 
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] To retry the last batch of tests fetched from the Queue API, please run the following command on your machine:')
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --format d --default-path spec_integration "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: To retry the last batch of tests fetched from the Queue API, please run the following command on your machine:')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --format d --default-path spec_integration "spec_integration/c_spec.rb"')
 
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] To retry all the tests assigned to this CI node, please run the following command on your machine:')
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: To retry all the tests assigned to this CI node, please run the following command on your machine:')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
 
       expect(actual.stdout).to include('3 examples, 0 failures')
 
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] Global test execution duration:')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: Global test execution duration:')
 
       expect(actual.exit_code).to eq 0
     end
@@ -230,7 +230,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       actual = subject
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] You forgot to call KnapsackPro::Adapters::RSpecAdapter.bind method in your test runner configuration file. It is needed to record test files time execution. Please follow the installation guide to configure your project properly https://knapsackpro.com/perma/ruby/installation-guide')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: You forgot to call KnapsackPro::Adapters::RSpecAdapter.bind method in your test runner configuration file. It is needed to record test files time execution. Please follow the installation guide to configure your project properly https://knapsackpro.com/perma/ruby/installation-guide')
 
       expect(actual.exit_code).to eq 1
     end
@@ -917,12 +917,12 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       expect(actual.stdout).to include('Randomized with seed 123')
 
       # 1st batch
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
       # 2nd batch
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/c_spec.rb"')
 
       # the final RSpec command with seed
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
 
       expect(actual.exit_code).to eq 0
     end
@@ -1061,7 +1061,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       expect(actual.stdout).to include('An error occurred while loading ./spec_integration/failing_spec.rb')
       expect(actual.stdout).to match(/undefined local variable or method .a_fake_method. for.* RSpec::ExampleGroups::BDescribe/)
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] RSpec wants to quit')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: RSpec wants to quit')
       expect(actual.stdout).to include('1 example, 0 failures, 1 error occurred outside of examples')
 
       expect(actual.exit_code).to eq 1
@@ -1263,7 +1263,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       # It breaks RSpec so it was not marked as failed.
       expect(actual.stdout).to include('2 examples, 0 failures')
 
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] Unexecuted tests on this CI node (including pending tests): spec_integration/b_spec.rb')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: Unexecuted tests on this CI node (including pending tests): spec_integration/b_spec.rb')
 
       expect(actual.exit_code).to eq 1
     end
@@ -1497,7 +1497,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       actual = subject
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] The run_all_when_everything_filtered option is deprecated. See: https://knapsackpro.com/perma/ruby/rspec-deprecated-run-all-when-everything-filtered')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: The run_all_when_everything_filtered option is deprecated. See: https://knapsackpro.com/perma/ruby/rspec-deprecated-run-all-when-everything-filtered')
 
       expect(actual.stdout).to_not include('A1 test example')
       expect(actual.stdout).to_not include('B1 test example')
@@ -1576,8 +1576,8 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       actual = subject
 
       expect(actual.stdout).to include('0 examples, 0 failures')
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] No test files were executed on this CI node.')
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: No test files were executed on this CI node.')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
 
       expect(actual.exit_code).to eq 0
     end
@@ -1601,8 +1601,8 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       actual = subject
 
       expect(actual.stdout).to include('0 examples, 0 failures')
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] No test files were executed on this CI node.')
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: No test files were executed on this CI node.')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
 
       expect(actual.exit_code).to eq 0
     end
@@ -1821,7 +1821,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       expect(actual.stdout).to_not include('C1 test example')
       expect(actual.stdout).to_not include('C2 test example')
 
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
 
       expect(actual.stdout).to include('2 examples, 1 failure')
 
@@ -1885,7 +1885,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       expect(actual.stdout).to_not include('C1 test example')
       expect(actual.stdout).to_not include('C2 test example')
 
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
 
       expect(actual.stdout).to include('3 examples, 2 failures')
 

data/spec/knapsack_pro/client/api/v1/queues_spec.rb

@@ -10,6 +10,7 @@ describe KnapsackPro::Client::API::V1::Queues do
     let(:masked_user_seat) { double }
     let(:can_initialize_queue) { [false, true].sample }
     let(:attempt_connect_to_queue) { [false, true].sample }
+    let(:batch_uuid) { SecureRandom.uuid }
 
     subject do
       described_class.queue(
@@ -19,7 +20,8 @@ describe KnapsackPro::Client::API::V1::Queues do
         branch: branch,
         node_total: node_total,
         node_index: node_index,
-        test_files: test_files
+        test_files: test_files,
+        batch_uuid: batch_uuid
       )
     end
 

data/spec/knapsack_pro/client/connection_spec.rb

@@ -72,6 +72,9 @@ shared_examples 'when retry request' do
 
     before do
       expect(KnapsackPro).to receive(:logger).at_least(1).and_return(logger)
+      allow(http).to receive(:set_debug_output)
+      allow(http).to receive(:ipaddr).and_return(nil)
+      allow(logger).to receive(:warn).at_least(:once)
     end
 
     it do
@@ -88,11 +91,11 @@ shared_examples 'when retry request' do
       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 for 8s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to the 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("Wait for 16s before retrying the request to the 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...")
@@ -127,12 +130,12 @@ shared_examples 'when retry request' do
         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("Wait for 8s before retrying the request to the 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("Wait for 16s before retrying the request to the 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...")
@@ -141,7 +144,7 @@ shared_examples 'when retry request' do
         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.")
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to the Knapsack Pro API.")
         11.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
@@ -174,12 +177,12 @@ shared_examples 'when retry request' do
         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("Wait for 8s before retrying the request to the 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("Wait for 16s before retrying the request to the 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...")
@@ -188,17 +191,17 @@ shared_examples 'when retry request' do
         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.")
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to the 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.")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to the 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.")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to the Knapsack Pro API.")
         19.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
@@ -231,12 +234,12 @@ shared_examples 'when retry request' do
         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("Wait for 8s before retrying the request to the 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("Wait for 16s before retrying the request to the 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...")
@@ -245,17 +248,17 @@ shared_examples 'when retry request' do
         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.")
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to the 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.")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to the 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.")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to the Knapsack Pro API.")
         19.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
@@ -311,6 +314,7 @@ describe KnapsackPro::Client::Connection do
       expect(http).to receive(:use_ssl=).with(false)
       expect(http).to receive(:open_timeout=).with(15)
       expect(http).to receive(:read_timeout=).with(15)
+      allow(http).to receive(:ipaddr=).at_least(:once)
     end
 
     context 'when http method is POST on GitHub Actions' do

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

@@ -61,30 +61,52 @@ describe KnapsackPro::Config::CI::GithubActions do
   describe '#branch' do
     subject { described_class.new.branch }
 
-    context 'when the environment exists' do
-      context 'when GITHUB_REF has value' do
-        let(:env) do
-          {
-            'GITHUB_REF' => 'main',
-            'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d',
-          }
-        end
-
-        it { should eql 'main' }
+    context 'when GITHUB_HEAD_REF is set' do
+      let(:env) do
+        {
+          'GITHUB_HEAD_REF' => 'feature',
+          'GITHUB_REF_NAME' => 'main',
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
       end
 
-      context 'when GITHUB_REF is not set' do
-        let(:env) do
-          {
-            'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d',
-          }
-        end
+      it { should eql 'feature' }
+    end
 
-        it { should eql '2e13512fc230d6f9ebf4923352718e4d' }
+    context 'when GITHUB_REF_NAME is set' do
+      let(:env) do
+        {
+          'GITHUB_REF_NAME' => 'main',
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
       end
+
+      it { should eql 'main' }
     end
 
-    context "when the environment doesn't exist" do
+    context 'when GITHUB_HEAD_REF is set to empty string' do
+      let(:env) do
+        {
+          'GITHUB_HEAD_REF' => '',
+          'GITHUB_REF_NAME' => 'main',
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
+      end
+
+      it { should eql 'main' }
+    end
+
+    context 'when GITHUB_SHA is set' do
+      let(:env) do
+        {
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
+      end
+
+      it { should eql '2e13512fc230d6f9ebf4923352718e4d' }
+    end
+
+    context 'with no ENVs' do
       it { should be nil }
     end
   end