knapsack_pro 3.8.0 → 7.0.0

data/spec/knapsack_pro/adapters/base_adapter_spec.rb

@@ -42,6 +42,18 @@ describe KnapsackPro::Adapters::BaseAdapter do
     end
   end
 
+  describe '.split_by_test_cases_enabled?' do
+    subject { described_class.split_by_test_cases_enabled? }
+
+    it { expect(subject).to be false }
+  end
+
+  describe '.test_file_cases_for' do
+    subject { described_class.test_file_cases_for([]) }
+
+    it { expect { subject }.to raise_error NotImplementedError }
+  end
+
   describe '.slow_test_file?' do
     let(:adapter_class) { double }
     let(:slow_test_files) do
@@ -98,6 +110,7 @@ describe KnapsackPro::Adapters::BaseAdapter do
 
     before do
       expect(::Kernel).to receive(:at_exit).and_yield
+      allow(File).to receive(:exist?)
       expect(File).to receive(:exist?).with('.knapsack_pro/KnapsackPro-Adapters-BaseAdapter-bind_method_called_for_node_0.txt').and_return(adapter_bind_method_called_file_exists)
     end
 
@@ -146,7 +159,7 @@ describe KnapsackPro::Adapters::BaseAdapter do
       it do
         logger = instance_double(Logger)
         expect(KnapsackPro).to receive(:logger).and_return(logger)
-        expect(logger).to receive(:debug).with('Test suite time execution recording enabled.')
+        expect(logger).to receive(:debug).with('Regular Mode enabled.')
       end
       it { expect(subject).to receive(:bind_time_tracker) }
       it { expect(subject).to receive(:bind_save_report) }
@@ -155,24 +168,22 @@ describe KnapsackPro::Adapters::BaseAdapter do
     context 'when queue recording enabled' do
       let(:queue_recording_enabled?) { true }
 
-      before do
-        allow(subject).to receive(:bind_before_queue_hook)
-        allow(subject).to receive(:bind_time_tracker)
-      end
-
-      it do
+      it 'calls queue hooks in proper order before binding time tracker' do
         logger = instance_double(Logger)
         expect(KnapsackPro).to receive(:logger).and_return(logger)
-        expect(logger).to receive(:debug).with('Test suite time execution queue recording enabled.')
+        expect(logger).to receive(:debug).with('Queue Mode enabled.')
+
+        expect(subject).to receive(:bind_before_queue_hook).ordered
+        expect(subject).to receive(:bind_after_queue_hook).ordered
+        expect(subject).to receive(:bind_time_tracker).ordered
       end
-      it { expect(subject).to receive(:bind_before_queue_hook) }
-      it { expect(subject).to receive(:bind_time_tracker) }
     end
 
     context 'when recording disabled' do
-      it { expect(subject).not_to receive(:bind_time_tracker) }
       it { expect(subject).not_to receive(:bind_save_report) }
       it { expect(subject).not_to receive(:bind_before_queue_hook) }
+      it { expect(subject).not_to receive(:bind_after_queue_hook) }
+      it { expect(subject).not_to receive(:bind_time_tracker) }
     end
   end
 
@@ -199,4 +210,12 @@ describe KnapsackPro::Adapters::BaseAdapter do
       }.to raise_error(NotImplementedError)
     end
   end
+
+  describe '#bind_after_queue_hook' do
+    it do
+      expect {
+        subject.bind_after_queue_hook
+      }.to raise_error(NotImplementedError)
+    end
+  end
 end

data/spec/knapsack_pro/adapters/cucumber_adapter_spec.rb

@@ -203,16 +203,13 @@ describe KnapsackPro::Adapters::CucumberAdapter do
       end
     end
 
-    describe '#bind_queue_mode' do
+    describe '#bind_after_queue_hook' do
       it do
-        expect(subject).to receive(:bind_before_queue_hook)
-        expect(subject).to receive(:bind_time_tracker)
-
         expect(::Kernel).to receive(:at_exit).and_yield
         expect(KnapsackPro::Hooks::Queue).to receive(:call_after_subset_queue)
         expect(KnapsackPro::Report).to receive(:save_subset_queue_to_file)
 
-        subject.bind_queue_mode
+        subject.bind_after_queue_hook
       end
     end
   end

data/spec/knapsack_pro/adapters/rspec_adapter_spec.rb

@@ -1,3 +1,5 @@
+require_relative '../../../lib/knapsack_pro/formatters/time_tracker'
+
 describe KnapsackPro::Adapters::RSpecAdapter do
   it 'backwards compatibility with knapsack gem old rspec adapter name' do
     expect(KnapsackPro::Adapters::RspecAdapter.new).to be_kind_of(described_class)
@@ -8,10 +10,85 @@ describe KnapsackPro::Adapters::RSpecAdapter do
   end
 
   context do
-    before { expect(::RSpec).to receive(:configure) }
+    before { expect(::RSpec).to receive(:configure).at_least(:once) }
     it_behaves_like 'adapter'
   end
 
+  describe '.split_by_test_cases_enabled?' do
+    subject { described_class.split_by_test_cases_enabled? }
+
+    before do
+      expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(rspec_split_by_test_examples_enabled)
+    end
+
+    context 'when the RSpec split by test examples is enabled' do
+      let(:rspec_split_by_test_examples_enabled) { true }
+
+      it { expect(subject).to be true }
+
+      context 'when the RSpec version is < 3.3.0' do
+        before do
+          stub_const('RSpec::Core::Version::STRING', '3.2.0')
+        end
+
+        it do
+          expect { subject }.to raise_error RuntimeError, 'RSpec >= 3.3.0 is required to split test files by test examples. Learn more: https://knapsackpro.com/perma/ruby/split-by-test-examples'
+        end
+      end
+    end
+
+    context 'when the RSpec split by test examples is disabled' do
+      let(:rspec_split_by_test_examples_enabled) { false }
+
+      it { expect(subject).to be false }
+    end
+  end
+
+  describe '.test_file_cases_for' do
+    let(:slow_test_files) do
+      [
+        '1_spec.rb',
+        '2_spec.rb',
+        '3_spec.rb',
+        '4_spec.rb',
+        '5_spec.rb',
+      ]
+    end
+
+    subject { described_class.test_file_cases_for(slow_test_files) }
+
+    before do
+      logger = instance_double(Logger)
+      expect(KnapsackPro).to receive(:logger).and_return(logger)
+      expect(logger).to receive(:info).with("Generating RSpec test examples JSON report for slow test files to prepare it to be split by test examples (by individual test cases). Thanks to that, a single slow test file can be split across parallel CI nodes. Analyzing 5 slow test files.")
+
+      cmd = 'RACK_ENV=test RAILS_ENV=test bundle exec rake knapsack_pro:rspec_test_example_detector'
+      expect(Kernel).to receive(:system).with(cmd).and_return(cmd_result)
+    end
+
+    context 'when the rake task to detect RSpec test examples succeeded' do
+      let(:cmd_result) { true }
+
+      it 'returns test example paths for slow test files' do
+        rspec_test_example_detector = instance_double(KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector)
+        expect(KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector).to receive(:new).and_return(rspec_test_example_detector)
+
+        test_file_example_paths = double
+        expect(rspec_test_example_detector).to receive(:test_file_example_paths).and_return(test_file_example_paths)
+
+        expect(subject).to eq test_file_example_paths
+      end
+    end
+
+    context 'when the rake task to detect RSpec test examples failed' do
+      let(:cmd_result) { false }
+
+      it do
+        expect { subject }.to raise_error(RuntimeError, 'Could not generate JSON report for RSpec. Rake task failed when running RACK_ENV=test RAILS_ENV=test bundle exec rake knapsack_pro:rspec_test_example_detector')
+      end
+    end
+  end
+
   describe '.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!' do
     let(:cli_args) { double }
 
@@ -162,59 +239,79 @@ describe KnapsackPro::Adapters::RSpecAdapter do
     end
   end
 
-  describe '.test_path' do
-    let(:example_group) do
-      {
-        file_path: '1_shared_example.rb',
-        parent_example_group: {
-          file_path: '2_shared_example.rb',
-          parent_example_group: {
-            file_path: 'a_spec.rb'
-          }
-        }
-      }
+  describe '.file_path_for' do
+    let(:current_example) { ::RSpec.describe.example }
+
+    subject { described_class.file_path_for(current_example) }
+
+    context "when id ends in _spec.rb" do
+      it "returns the first part of the id" do
+        allow(current_example).to receive(:id).and_return("./foo_spec.rb[1:1]")
+
+        expect(subject).to eq('./foo_spec.rb')
+      end
     end
-    let(:current_example) do
-      OpenStruct.new(metadata: {
-        example_group: example_group
-      })
+
+    context "when id does not end in _spec.rb" do
+      it "returns the file_path" do
+        allow(current_example).to receive(:id).and_return("./foo.rb")
+        allow(current_example).to receive(:metadata).and_return(file_path: "./foo_spec.rb")
+
+        expect(subject).to eq('./foo_spec.rb')
+      end
     end
 
-    subject { described_class.test_path(current_example) }
+    context "when id and file_path do not end in _spec.rb" do
+      it "returns the example_group's file_path" do
+        allow(current_example).to receive(:id).and_return("./foo.rb")
+        allow(current_example).to receive(:metadata).and_return(
+          file_path: "./foo.rb", example_group: { file_path: "./foo_spec.rb" }
+        )
 
-    it { should eql 'a_spec.rb' }
+        expect(subject).to eq('./foo_spec.rb')
+      end
+    end
 
-    context 'with turnip features' do
-      describe 'when the turnip version is less than 2' do
-        let(:example_group) do
-          {
-            file_path: "./spec/features/logging_in.feature",
-            turnip: true,
+    context "when id, file_path, and example_group's file_path do not end in _spec.rb" do
+      it "returns the top_level_group's file_path" do
+        allow(current_example).to receive(:id).and_return("./foo.rb")
+        allow(current_example).to receive(:metadata).and_return(
+          file_path: "./foo.rb",
+          example_group: {
+            file_path: "./foo.rb",
             parent_example_group: {
-              file_path: "gems/turnip-1.2.4/lib/turnip/rspec.rb"
+              file_path: "./foo_spec.rb",
             }
           }
-        end
-
-        before { stub_const("Turnip::VERSION", '1.2.4') }
+        )
 
-        it { should eql './spec/features/logging_in.feature' }
+        expect(subject).to eq('./foo_spec.rb')
       end
+    end
 
-      describe 'when turnip is version 2 or greater' do
-        let(:example_group) do
-          {
-            file_path: "gems/turnip-2.0.0/lib/turnip/rspec.rb",
-            turnip: true,
+    context "when id, file_path, example_group's, and top_level_group's file_path do not end in _spec.rb" do
+      it "returns empty string" do
+        allow(current_example).to receive(:id).and_return("./foo.rb")
+        allow(current_example).to receive(:metadata).and_return(
+          file_path: "./foo.rb",
+          example_group: {
+            file_path: "./foo.rb",
             parent_example_group: {
-              file_path: "./spec/features/logging_in.feature",
+              file_path: "./foo.rb",
             }
           }
-        end
+        )
 
-        before { stub_const("Turnip::VERSION",  '2.0.0') }
+        expect(subject).to eq('')
+      end
+    end
+
+    context "when id does not end in .feature (nor _spec.rb)" do
+      it "returns the file_path" do
+        allow(current_example).to receive(:id).and_return("./foo.rb")
+        allow(current_example).to receive(:metadata).and_return(file_path: "./foo.feature")
 
-        it { should eql './spec/features/logging_in.feature' }
+        expect(subject).to eq("./foo.feature")
       end
     end
   end
@@ -223,155 +320,37 @@ describe KnapsackPro::Adapters::RSpecAdapter do
     let(:config) { double }
 
     describe '#bind_time_tracker' do
-      let(:tracker) { instance_double(KnapsackPro::Tracker) }
-      let(:logger) { instance_double(Logger) }
-      let(:global_time) { 'Global time: 01m 05s' }
-      let(:test_path) { 'spec/a_spec.rb' }
       let(:current_example) { double(metadata: {}) }
 
       context "when the example's metadata has :focus tag AND RSpec inclusion rule includes :focus" do
         let(:current_example) { double(metadata: { focus: true }) }
+        let(:test_path) { 'spec/a_spec.rb' }
 
         it do
-          expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(false)
-
-          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(current_example)
           expect(::RSpec).to receive(:configure).and_yield(config)
 
-          expect(tracker).to receive(:current_test_path).ordered.and_return(test_path)
-          expect(tracker).to receive(:stop_timer).ordered
-
-          expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
-
-          expect(tracker).to receive(:current_test_path=).with(test_path).ordered
+          expect(described_class).to receive(:file_path_for).with(current_example).and_return(test_path)
 
           expect(described_class).to receive_message_chain(:rspec_configuration, :filter, :rules, :[]).with(:focus).and_return(true)
 
           expect {
             subject.bind_time_tracker
-          }.to raise_error /We detected a test file path spec\/a_spec\.rb with a test using the metadata `:focus` tag/
+          }.to raise_error /Knapsack Pro found an example tagged with focus in spec\/a_spec\.rb/i
         end
       end
 
-      context 'when rspec split by test examples is disabled' do
-        before do
-          expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(false)
-        end
-
+      context 'with no focus' 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(current_example)
-          expect(config).to receive(:append_after).with(:context).and_yield
-          expect(config).to receive(:after).with(:suite).and_yield
-          expect(::RSpec).to receive(:configure).and_yield(config)
-
-          expect(tracker).to receive(:current_test_path).ordered.and_return(test_path)
-          expect(tracker).to receive(:stop_timer).ordered
-
-          expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
-
-          expect(tracker).to receive(:current_test_path=).with(test_path).ordered
+          expect(config).to receive(:append_after).with(:suite)
+          expect(::RSpec).to receive(:configure).at_least(1).and_yield(config)
 
           expect(current_example).to receive(:run)
 
-          expect(tracker).to receive(:stop_timer).ordered
-
-          expect(KnapsackPro::Presenter).to receive(:global_time).and_return(global_time)
-          expect(KnapsackPro).to receive(:logger).and_return(logger)
-          expect(logger).to receive(:debug).with(global_time)
-
           subject.bind_time_tracker
         end
       end
-
-      context 'when rspec split by test examples is enabled' do
-        let(:test_example_path) { 'spec/a_spec.rb[1:1]' }
-
-        before do
-          expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(true)
-        end
-
-        context 'when current test_path is a slow test file' do
-          before do
-            expect(described_class).to receive(:slow_test_file?).with(described_class, test_path).and_return(true)
-          end
-
-          it 'records time for example.id' do
-            expect(current_example).to receive(:id).and_return(test_example_path)
-
-            expect(config).to receive(:prepend_before).with(:context).and_yield
-
-            allow(KnapsackPro).to receive(:tracker).and_return(tracker)
-            expect(tracker).to receive(:start_timer).ordered
-
-            expect(config).to receive(:around).with(:each).and_yield(current_example)
-            expect(config).to receive(:append_after).with(:context).and_yield
-            expect(config).to receive(:after).with(:suite).and_yield
-            expect(::RSpec).to receive(:configure).and_yield(config)
-
-            expect(tracker).to receive(:current_test_path).ordered.and_return(test_path)
-            expect(tracker).to receive(:stop_timer).ordered
-
-            expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
-
-            expect(tracker).to receive(:current_test_path=).with(test_example_path).ordered
-
-            expect(current_example).to receive(:run)
-
-            expect(tracker).to receive(:stop_timer).ordered
-
-            expect(KnapsackPro::Presenter).to receive(:global_time).and_return(global_time)
-            expect(KnapsackPro).to receive(:logger).and_return(logger)
-            expect(logger).to receive(:debug).with(global_time)
-
-            subject.bind_time_tracker
-          end
-        end
-
-        context 'when current test_path is not a slow test file' do
-          before do
-            expect(described_class).to receive(:slow_test_file?).with(described_class, test_path).and_return(false)
-          end
-
-          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(current_example)
-            expect(config).to receive(:append_after).with(:context).and_yield
-            expect(config).to receive(:after).with(:suite).and_yield
-            expect(::RSpec).to receive(:configure).and_yield(config)
-
-            expect(described_class).to receive(:test_path).with(current_example).and_return(test_path)
-
-            expect(tracker).to receive(:current_test_path).ordered.and_return(test_path)
-            expect(tracker).to receive(:stop_timer).ordered
-
-            expect(tracker).to receive(:current_test_path=).with(test_path).ordered
-
-            expect(current_example).to receive(:run)
-
-            expect(tracker).to receive(:stop_timer).ordered
-
-            expect(KnapsackPro::Presenter).to receive(:global_time).and_return(global_time)
-            expect(KnapsackPro).to receive(:logger).and_return(logger)
-            expect(logger).to receive(:debug).with(global_time)
-
-            subject.bind_time_tracker
-          end
-        end
-      end
     end
 
     describe '#bind_save_report' do
@@ -379,21 +358,14 @@ describe KnapsackPro::Adapters::RSpecAdapter do
         expect(config).to receive(:after).with(:suite).and_yield
         expect(::RSpec).to receive(:configure).and_yield(config)
 
-        expect(KnapsackPro::Report).to receive(:save)
+        time_tracker = instance_double(KnapsackPro::Formatters::TimeTracker)
+        times = [{ path: "foo_spec.rb", time_execution: 1.0 }]
+        expect(time_tracker).to receive(:batch).and_return(times)
+        expect(KnapsackPro::Formatters::TimeTrackerFetcher).to receive(:call).and_return(time_tracker)
+        expect(KnapsackPro::Report).to receive(:save).with(times)
 
         subject.bind_save_report
       end
     end
-
-    describe '#bind_before_queue_hook' do
-      it do
-        expect(config).to receive(:before).with(:suite).and_yield
-        expect(::RSpec).to receive(:configure).and_yield(config)
-
-        expect(KnapsackPro::Hooks::Queue).to receive(:call_before_queue)
-
-        subject.bind_before_queue_hook
-      end
-    end
   end
 end

data/spec/knapsack_pro/base_allocator_builder_spec.rb

@@ -117,8 +117,8 @@ describe KnapsackPro::BaseAllocatorBuilder do
   describe '#fast_and_slow_test_files_to_run' do
     subject { allocator_builder.fast_and_slow_test_files_to_run }
 
-    context 'when looking for test files on disk by default' do
-      it do
+    context 'when split by test cases disabled' do
+      it 'returns test files to run based on test files on the disk' do
         test_file_pattern = double
         expect(KnapsackPro::TestFilePattern).to receive(:call).with(adapter_class).and_return(test_file_pattern)
 
@@ -129,70 +129,44 @@ describe KnapsackPro::BaseAllocatorBuilder do
       end
     end
 
-    context 'when RSpec adapter AND rspec split by test examples is enabled' do
-      let(:adapter_class) { KnapsackPro::Adapters::RSpecAdapter }
+    context 'when split by test cases enabled' do
       let(:test_files_to_run) { double }
-      let(:cmd) { 'RACK_ENV=test RAILS_ENV=test bundle exec rake knapsack_pro:rspec_test_example_detector' }
 
-      before do
-        expect(KnapsackPro::Config::Env).to receive(:rspec_split_by_test_examples?).and_return(true)
+      before  do
+        expect(adapter_class).to receive(:split_by_test_cases_enabled?).and_return(true)
 
         test_file_pattern = double
         expect(KnapsackPro::TestFilePattern).to receive(:call).with(adapter_class).and_return(test_file_pattern)
 
         expect(KnapsackPro::TestFileFinder).to receive(:call).with(test_file_pattern).and_return(test_files_to_run)
-      end
 
-      context 'when RSpec version < 3.3.0' do
-        before do
-          stub_const('RSpec::Core::Version::STRING', '3.2.0')
-        end
-
-        it do
-          expect { subject }.to raise_error RuntimeError, 'RSpec >= 3.3.0 is required to split test files by test examples. Learn more: https://knapsackpro.com/perma/ruby/split-by-test-examples'
-        end
+        expect(allocator_builder).to receive(:get_slow_test_files).and_return(slow_test_files)
       end
 
-      context 'when rake task to detect RSpec test examples works' do
-        let(:slow_test_files) { double(size: 5) }
-        let(:cmd_result) { true }
-        let(:test_file_example_paths) { double }
-        let(:logger) { instance_double(Logger) }
-        let(:test_files_with_test_cases) { double }
-
-        before do
-          expect(allocator_builder).to receive(:get_slow_test_files).and_return(slow_test_files)
-
-          expect(KnapsackPro).to receive(:logger).and_return(logger)
-
-          expect(Kernel).to receive(:system).with(cmd).and_return(cmd_result)
-
-          rspec_test_example_detector = instance_double(KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector)
-          expect(KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector).to receive(:new).and_return(rspec_test_example_detector)
-          expect(rspec_test_example_detector).to receive(:test_file_example_paths).and_return(test_file_example_paths)
-
-          expect(KnapsackPro::TestFilesWithTestCasesComposer).to receive(:call).with(test_files_to_run, slow_test_files, test_file_example_paths).and_return(test_files_with_test_cases)
+      context 'when slow test files are detected' do
+        let(:slow_test_files) do
+          [
+            '1_spec.rb',
+            '2_spec.rb',
+          ]
         end
 
-        it do
-          expect(logger).to receive(:info).with("Generating RSpec test examples JSON report for slow test files to prepare it to be split by test examples (by individual 'it's. Thanks to that a single slow test file can be split across parallel CI nodes). Analyzing 5 slow test files.")
+        it 'returns test files with test cases' do
+          test_file_cases = double
+          expect(adapter_class).to receive(:test_file_cases_for).with(slow_test_files).and_return(test_file_cases)
+
+          test_files_with_test_cases = double
+          expect(KnapsackPro::TestFilesWithTestCasesComposer).to receive(:call).with(test_files_to_run, slow_test_files, test_file_cases).and_return(test_files_with_test_cases)
 
           expect(subject).to eq test_files_with_test_cases
         end
       end
 
-      context 'when rake task to detect RSpec test examples failed' do
-        let(:slow_test_files) { double(size: 5) }
-        let(:cmd_result) { false }
-
-        before do
-          expect(allocator_builder).to receive(:get_slow_test_files).and_return(slow_test_files)
-
-          expect(Kernel).to receive(:system).with(cmd).and_return(cmd_result)
-        end
+      context 'when slow test files are not detected' do
+        let(:slow_test_files) { [] }
 
-        it do
-          expect { subject }.to raise_error(RuntimeError, 'Could not generate JSON report for RSpec. Rake task failed when running RACK_ENV=test RAILS_ENV=test bundle exec rake knapsack_pro:rspec_test_example_detector')
+        it 'returns test files without test cases' do
+          expect(subject).to eq test_files_to_run
         end
       end
     end

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

@@ -6,7 +6,9 @@ describe KnapsackPro::Client::API::V1::BuildDistributions do
     let(:node_total) { double }
     let(:node_index) { double }
     let(:ci_build_id) { double }
+    let(:masked_user_seat) { double }
     let(:test_files) { double }
+    let(:cache_read_attempt) { [false, true].sample }
 
     subject do
       described_class.subset(
@@ -22,6 +24,7 @@ describe KnapsackPro::Client::API::V1::BuildDistributions do
     before do
       expect(KnapsackPro::Config::Env).to receive(:fixed_test_suite_split).and_return(fixed_test_suite_split)
       expect(KnapsackPro::Config::Env).to receive(:ci_node_build_id).and_return(ci_build_id)
+      expect(KnapsackPro::Config::Env).to receive(:masked_user_seat).and_return(masked_user_seat)
     end
 
     context 'when cache_read_attempt=true' do
@@ -29,19 +32,9 @@ describe KnapsackPro::Client::API::V1::BuildDistributions do
 
       it 'does not send test_files among other params' do
         action = double
-        expect(KnapsackPro::Client::API::Action).to receive(:new).with({
-          endpoint_path: '/v1/build_distributions/subset',
-          http_method: :post,
-          request_hash: {
-            fixed_test_suite_split: fixed_test_suite_split,
-            cache_read_attempt: cache_read_attempt,
-            commit_hash: commit_hash,
-            branch: branch,
-            node_total: node_total,
-            node_index: node_index,
-            ci_build_id: ci_build_id,
-          }
-        }).and_return(action)
+        expect(KnapsackPro::Client::API::Action).to receive(:new).with(
+          hash_including(request_hash: hash_excluding(:test_files))
+        ).and_return(action)
         expect(subject).to eq action
       end
     end
@@ -51,23 +44,22 @@ describe KnapsackPro::Client::API::V1::BuildDistributions do
 
       it 'sends test_files among other params' do
         action = double
-        expect(KnapsackPro::Client::API::Action).to receive(:new).with({
-          endpoint_path: '/v1/build_distributions/subset',
-          http_method: :post,
-          request_hash: {
-            fixed_test_suite_split: fixed_test_suite_split,
-            cache_read_attempt: cache_read_attempt,
-            commit_hash: commit_hash,
-            branch: branch,
-            node_total: node_total,
-            node_index: node_index,
-            ci_build_id: ci_build_id,
-            test_files: test_files
-          }
-        }).and_return(action)
+        expect(KnapsackPro::Client::API::Action).to receive(:new).with(
+          hash_including(request_hash: hash_including(test_files: test_files))
+        ).and_return(action)
         expect(subject).to eq action
       end
     end
+
+    it "sends authors" do
+      action = double
+
+      expect(KnapsackPro::Client::API::Action).to receive(:new).with(
+        hash_including(request_hash: hash_including(:build_author, :commit_authors))
+      ).and_return(action)
+
+      expect(subject).to eq action
+    end
   end
 
   describe '.last' do