1 files changed, 39 insertions, 25 deletions

diff --git a/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb b/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb
index 79920dcb2c7..cde42783d8c 100644
--- a/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb
+++ b/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Ci::JobArtifacts::DestroyBatchService do
     create(:ci_job_artifact, :trace, :expired)
   end
 
-  describe '.execute' do
+  describe '#execute' do
     subject(:execute) { service.execute }
 
     it 'creates a deleted object for artifact with attached file' do
@@ -207,44 +207,58 @@ RSpec.describe Ci::JobArtifacts::DestroyBatchService do
       end
     end
 
-    context 'ProjectStatistics' do
-      it 'resets project statistics' do
-        expect(ProjectStatistics).to receive(:increment_statistic).once
-          .with(artifact_with_file.project, :build_artifacts_size, -artifact_with_file.file.size)
-          .and_call_original
-        expect(ProjectStatistics).to receive(:increment_statistic).once
-          .with(artifact_without_file.project, :build_artifacts_size, 0)
-          .and_call_original
+    context 'ProjectStatistics', :sidekiq_inline do
+      let_it_be(:project_1) { create(:project) }
+      let_it_be(:project_2) { create(:project) }
+
+      let(:artifact_with_file) { create(:ci_job_artifact, :zip, project: project_1) }
+      let(:artifact_with_file_2) { create(:ci_job_artifact, :zip, project: project_1) }
+      let(:artifact_without_file) { create(:ci_job_artifact, project: project_2) }
+      let!(:artifacts) { Ci::JobArtifact.where(id: [artifact_with_file.id, artifact_without_file.id, artifact_with_file_2.id]) }
+
+      it 'updates project statistics by the relevant amount' do
+        expected_amount = -(artifact_with_file.size + artifact_with_file_2.size)
+
+        expect { execute }
+          .to change { project_1.statistics.reload.build_artifacts_size }.by(expected_amount)
+          .and change { project_2.statistics.reload.build_artifacts_size }.by(0)
+      end
+
+      it 'increments project statistics with artifact size as amount and job artifact id as ref' do
+        project_1_increments = [
+          have_attributes(amount: -artifact_with_file.size, ref: artifact_with_file.id),
+          have_attributes(amount: -artifact_with_file_2.file.size, ref: artifact_with_file_2.id)
+        ]
+        project_2_increments = [have_attributes(amount: 0, ref: artifact_without_file.id)]
+
+        expect(ProjectStatistics).to receive(:bulk_increment_statistic).with(project_1, :build_artifacts_size, match_array(project_1_increments))
+        expect(ProjectStatistics).to receive(:bulk_increment_statistic).with(project_2, :build_artifacts_size, match_array(project_2_increments))
 
         execute
       end
 
       context 'with update_stats: false' do
-        let_it_be(:extra_artifact_with_file) do
-          create(:ci_job_artifact, :zip, project: artifact_with_file.project)
-        end
-
-        let(:artifacts) do
-          Ci::JobArtifact.where(id: [artifact_with_file.id, extra_artifact_with_file.id,
-                                     artifact_without_file.id, trace_artifact.id])
-        end
+        subject(:execute) { service.execute(update_stats: false) }
 
         it 'does not update project statistics' do
-          expect(ProjectStatistics).not_to receive(:increment_statistic)
-
-          service.execute(update_stats: false)
+          expect { execute }.not_to change { [project_1.statistics.reload.build_artifacts_size, project_2.statistics.reload.build_artifacts_size] }
         end
 
-        it 'returns size statistics' do
+        it 'returns statistic updates per project' do
+          project_1_updates = [
+            have_attributes(amount: -artifact_with_file.size, ref: artifact_with_file.id),
+            have_attributes(amount: -artifact_with_file_2.file.size, ref: artifact_with_file_2.id)
+          ]
+          project_2_updates = [have_attributes(amount: 0, ref: artifact_without_file.id)]
+
           expected_updates = {
             statistics_updates: {
-              artifact_with_file.project => -(artifact_with_file.file.size + extra_artifact_with_file.file.size),
-              artifact_without_file.project => 0
+              project_1 => match_array(project_1_updates),
+              project_2 => project_2_updates
             }
           }
 
-          expect(service.execute(update_stats: false)).to match(
-            a_hash_including(expected_updates))
+          expect(execute).to match(a_hash_including(expected_updates))
         end
       end
     end