Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 7 insertions, 3 deletions

diff --git a/spec/workers/project_export_worker_spec.rb b/spec/workers/project_export_worker_spec.rb
index 373e7f32530..4c49939d34e 100644
--- a/spec/workers/project_export_worker_spec.rb
+++ b/spec/workers/project_export_worker_spec.rb
@@ -17,14 +17,18 @@ describe ProjectExportWorker do
 
     context 'when it succeeds' do
       it 'calls the ExportService' do
-        expect_any_instance_of(::Projects::ImportExport::ExportService).to receive(:execute)
+        expect_next_instance_of(::Projects::ImportExport::ExportService) do |service|
+          expect(service).to receive(:execute)
+        end
 
         subject.perform(user.id, project.id, { 'klass' => 'Gitlab::ImportExport::AfterExportStrategies::DownloadNotificationStrategy' })
       end
 
       context 'export job' do
         before do
-          allow_any_instance_of(::Projects::ImportExport::ExportService).to receive(:execute)
+          allow_next_instance_of(::Projects::ImportExport::ExportService) do |service|
+            allow(service).to receive(:execute)
+          end
         end
 
         it 'creates an export job record for the project' do
@@ -51,7 +55,7 @@ describe ProjectExportWorker do
 
     context 'when it fails' do
       it 'does not raise an exception when strategy is invalid' do
-        expect_any_instance_of(::Projects::ImportExport::ExportService).not_to receive(:execute)
+        expect(::Projects::ImportExport::ExportService).not_to receive(:new)
 
         expect { subject.perform(user.id, project.id, { 'klass' => 'Whatever' }) }.not_to raise_error
       end