Refactor: extract duplicate steps to a service class

2 files changed, 17 insertions, 45 deletions

diff --git a/spec/workers/project_cache_worker_spec.rb b/spec/workers/project_cache_worker_spec.rb
index d2445f420f8..3c40269adc7 100644
--- a/spec/workers/project_cache_worker_spec.rb
+++ b/spec/workers/project_cache_worker_spec.rb
@@ -48,7 +48,7 @@ describe ProjectCacheWorker do
 
         it 'updates the project statistics' do
           expect(worker).to receive(:update_statistics)
-            .with(kind_of(Project), %i(repository_size))
+            .with(kind_of(Project), statistics)
             .and_call_original
 
           worker.perform(project.id, [], statistics)
@@ -73,28 +73,31 @@ describe ProjectCacheWorker do
     let(:statistics) { %w(repository_size) }
 
     context 'when a lease could not be obtained' do
-      it 'does not update the repository size' do
+      it 'does not update the project statistics' do
         stub_exclusive_lease_taken(lease_key, timeout: lease_timeout)
 
+        expect(Projects::UpdateStatisticsService).not_to receive(:new)
+
         expect(UpdateProjectStatisticsWorker).not_to receive(:perform_in)
 
-        worker.update_statistics(project, statistics.map(&:to_sym))
+        worker.update_statistics(project, statistics)
       end
     end
 
     context 'when a lease could be obtained' do
-      it 'updates the project statistics' do
+      it 'updates the project statistics twice' do
         stub_exclusive_lease(lease_key, timeout: lease_timeout)
 
-        expect(project.statistics).to receive(:refresh!)
-          .with(only: statistics.map(&:to_sym))
+        expect(Projects::UpdateStatisticsService).to receive(:new)
+          .with(project, nil, statistics: statistics)
           .and_call_original
+          .twice
 
         expect(UpdateProjectStatisticsWorker).to receive(:perform_in)
-          .with(lease_timeout, project.id, statistics.map(&:to_sym))
+          .with(lease_timeout, project.id, statistics)
           .and_call_original
 
-        worker.update_statistics(project, statistics.map(&:to_sym))
+        worker.update_statistics(project, statistics)
       end
     end
   end
diff --git a/spec/workers/update_project_statistics_worker_spec.rb b/spec/workers/update_project_statistics_worker_spec.rb
index 3411e10da7e..a268fd2e4ba 100644
--- a/spec/workers/update_project_statistics_worker_spec.rb
+++ b/spec/workers/update_project_statistics_worker_spec.rb
@@ -3,46 +3,15 @@ require 'spec_helper'
 describe UpdateProjectStatisticsWorker do
   let(:worker) { described_class.new }
   let(:project) { create(:project, :repository) }
+  let(:statistics) { %w(repository_size) }
 
   describe '#perform' do
-    context 'with a non-existing project' do
-      it 'does nothing' do
-        expect_any_instance_of(ProjectStatistics).not_to receive(:refresh!)
+    it 'updates the project statistics' do
+      expect(Projects::UpdateStatisticsService).to receive(:new)
+        .with(project, nil, statistics: statistics)
+        .and_call_original
 
-        worker.perform(-1)
-      end
-    end
-
-    context 'with an existing project without a repository' do
-      it 'does nothing' do
-        allow_any_instance_of(Repository).to receive(:exists?).and_return(false)
-
-        expect_any_instance_of(ProjectStatistics).not_to receive(:refresh!)
-
-        worker.perform(project.id)
-      end
-    end
-
-    context 'with an existing project' do
-      it 'refreshes the project statistics' do
-        expect_any_instance_of(ProjectStatistics).to receive(:refresh!)
-          .with(only: [])
-          .and_call_original
-
-        worker.perform(project.id)
-      end
-
-      context 'with a specific statistics target' do
-        it 'refreshes the project repository size' do
-          statistics_target = %w(repository_size)
-
-          expect_any_instance_of(ProjectStatistics).to receive(:refresh!)
-            .with(only: statistics_target.map(&:to_sym))
-            .and_call_original
-
-          worker.perform(project.id, statistics_target)
-        end
-      end
+      worker.perform(project.id, statistics)
     end
   end
 end