diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /spec/workers/bulk_imports/entity_worker_spec.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'spec/workers/bulk_imports/entity_worker_spec.rb')
-rw-r--r-- | spec/workers/bulk_imports/entity_worker_spec.rb | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/spec/workers/bulk_imports/entity_worker_spec.rb b/spec/workers/bulk_imports/entity_worker_spec.rb index ab85b587975..0fcdbccc304 100644 --- a/spec/workers/bulk_imports/entity_worker_spec.rb +++ b/spec/workers/bulk_imports/entity_worker_spec.rb @@ -37,9 +37,11 @@ RSpec.describe BulkImports::EntityWorker do .to receive(:info).twice .with( hash_including( - 'entity_id' => entity.id, + 'bulk_import_entity_id' => entity.id, + 'bulk_import_id' => entity.bulk_import_id, 'current_stage' => nil, - 'message' => 'Stage starting' + 'message' => 'Stage starting', + 'importer' => 'gitlab_migration' ) ) end @@ -67,8 +69,10 @@ RSpec.describe BulkImports::EntityWorker do .to receive(:info).twice .with( hash_including( - 'entity_id' => entity.id, - 'current_stage' => nil + 'bulk_import_entity_id' => entity.id, + 'bulk_import_id' => entity.bulk_import_id, + 'current_stage' => nil, + 'importer' => 'gitlab_migration' ) ) @@ -76,16 +80,23 @@ RSpec.describe BulkImports::EntityWorker do .to receive(:error) .with( hash_including( - 'entity_id' => entity.id, + 'bulk_import_entity_id' => entity.id, + 'bulk_import_id' => entity.bulk_import_id, 'current_stage' => nil, - 'message' => 'Error!' + 'message' => 'Error!', + 'importer' => 'gitlab_migration' ) ) end expect(Gitlab::ErrorTracking) .to receive(:track_exception) - .with(exception, entity_id: entity.id) + .with( + exception, + bulk_import_entity_id: entity.id, + bulk_import_id: entity.bulk_import_id, + importer: 'gitlab_migration' + ) subject end @@ -99,9 +110,11 @@ RSpec.describe BulkImports::EntityWorker do .to receive(:info).twice .with( hash_including( - 'entity_id' => entity.id, + 'bulk_import_entity_id' => entity.id, + 'bulk_import_id' => entity.bulk_import_id, 'current_stage' => 0, - 'message' => 'Stage running' + 'message' => 'Stage running', + 'importer' => 'gitlab_migration' ) ) end @@ -127,8 +140,10 @@ RSpec.describe BulkImports::EntityWorker do .to receive(:info).twice .with( hash_including( - 'entity_id' => entity.id, - 'current_stage' => 0 + 'bulk_import_entity_id' => entity.id, + 'bulk_import_id' => entity.bulk_import_id, + 'current_stage' => 0, + 'importer' => 'gitlab_migration' ) ) end |