Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 2 deletions

diff --git a/spec/workers/project_export_worker_spec.rb b/spec/workers/project_export_worker_spec.rb
index 373e7f32530..6adf9a1335f 100644
--- a/spec/workers/project_export_worker_spec.rb
+++ b/spec/workers/project_export_worker_spec.rb
@@ -17,14 +17,32 @@ 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 'with measurement options provided' do
+        it 'calls the ExportService with measurement options' do
+          measurement_options = { measurement_enabled: true }
+          params = {}
+          after_export_strategy = { 'klass' => 'Gitlab::ImportExport::AfterExportStrategies::DownloadNotificationStrategy' }
+
+          expect_next_instance_of(::Projects::ImportExport::ExportService) do |service|
+            expect(service).to receive(:execute).with(instance_of(Gitlab::ImportExport::AfterExportStrategies::DownloadNotificationStrategy), measurement_options)
+          end
+
+          subject.perform(user.id, project.id, after_export_strategy, params, measurement_options)
+        end
+      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