Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 14 deletions

diff --git a/spec/workers/bulk_imports/entity_worker_spec.rb b/spec/workers/bulk_imports/entity_worker_spec.rb
index ab85b587975..ba638e1369e 100644
--- a/spec/workers/bulk_imports/entity_worker_spec.rb
+++ b/spec/workers/bulk_imports/entity_worker_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe BulkImports::EntityWorker do
           .to receive(:info).twice
           .with(
             hash_including(
-              'entity_id' => entity.id,
+              'bulk_import_entity_id' => entity.id,
               'current_stage' => nil,
               'message' => 'Stage starting'
             )
@@ -67,7 +67,7 @@ RSpec.describe BulkImports::EntityWorker do
           .to receive(:info).twice
           .with(
             hash_including(
-              'entity_id' => entity.id,
+              'bulk_import_entity_id' => entity.id,
               'current_stage' => nil
             )
           )
@@ -76,7 +76,7 @@ RSpec.describe BulkImports::EntityWorker do
           .to receive(:error)
           .with(
             hash_including(
-              'entity_id' => entity.id,
+              'bulk_import_entity_id' => entity.id,
               'current_stage' => nil,
               'message' => 'Error!'
             )
@@ -85,7 +85,7 @@ RSpec.describe BulkImports::EntityWorker do
 
       expect(Gitlab::ErrorTracking)
         .to receive(:track_exception)
-              .with(exception, entity_id: entity.id)
+              .with(exception, bulk_import_entity_id: entity.id)
 
       subject
     end
@@ -99,7 +99,7 @@ RSpec.describe BulkImports::EntityWorker do
             .to receive(:info).twice
             .with(
               hash_including(
-                'entity_id' => entity.id,
+                'bulk_import_entity_id' => entity.id,
                 'current_stage' => 0,
                 'message' => 'Stage running'
               )
@@ -127,7 +127,7 @@ RSpec.describe BulkImports::EntityWorker do
             .to receive(:info).twice
             .with(
               hash_including(
-                'entity_id' => entity.id,
+                'bulk_import_entity_id' => entity.id,
                 'current_stage' => 0
               )
             )
diff --git a/spec/workers/bulk_imports/pipeline_worker_spec.rb b/spec/workers/bulk_imports/pipeline_worker_spec.rb
index cc403f91191..ef1db948893 100644
--- a/spec/workers/bulk_imports/pipeline_worker_spec.rb
+++ b/spec/workers/bulk_imports/pipeline_worker_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe BulkImports::PipelineWorker do
           .with(
             hash_including(
               'pipeline_name' => 'FakePipeline',
-              'entity_id' => entity.id
+              'bulk_import_entity_id' => entity.id
             )
           )
       end
@@ -83,7 +83,7 @@ RSpec.describe BulkImports::PipelineWorker do
           .with(
             hash_including(
               'pipeline_tracker_id' => pipeline_tracker.id,
-              'entity_id' => entity.id,
+              'bulk_import_entity_id' => entity.id,
               'message' => 'Unstarted pipeline not found'
             )
           )
@@ -120,7 +120,7 @@ RSpec.describe BulkImports::PipelineWorker do
           .with(
             hash_including(
               'pipeline_name' => 'FakePipeline',
-              'entity_id' => entity.id,
+              'bulk_import_entity_id' => entity.id,
               'message' => 'Error!'
             )
           )
@@ -130,7 +130,7 @@ RSpec.describe BulkImports::PipelineWorker do
         .to receive(:track_exception)
         .with(
           instance_of(StandardError),
-          entity_id: entity.id,
+          bulk_import_entity_id: entity.id,
           pipeline_name: pipeline_tracker.pipeline_name
         )
 
@@ -178,7 +178,7 @@ RSpec.describe BulkImports::PipelineWorker do
             .with(
               hash_including(
                 'pipeline_name' => 'FakePipeline',
-                'entity_id' => entity.id,
+                'bulk_import_entity_id' => entity.id,
                 'message' => 'Skipping pipeline due to failed entity'
               )
             )
@@ -225,7 +225,7 @@ RSpec.describe BulkImports::PipelineWorker do
             .with(
               hash_including(
                 'pipeline_name' => 'FakePipeline',
-                'entity_id' => entity.id
+                'bulk_import_entity_id' => entity.id
               )
             )
         end
@@ -348,7 +348,7 @@ RSpec.describe BulkImports::PipelineWorker do
             .with(
               hash_including(
                 'pipeline_name' => 'NdjsonPipeline',
-                'entity_id' => entity.id,
+                'bulk_import_entity_id' => entity.id,
                 'message' => 'Pipeline timeout'
               )
             )
@@ -375,7 +375,7 @@ RSpec.describe BulkImports::PipelineWorker do
             .with(
               hash_including(
                 'pipeline_name' => 'NdjsonPipeline',
-                'entity_id' => entity.id,
+                'bulk_import_entity_id' => entity.id,
                 'message' => 'Export from source instance failed: Error!'
               )
             )