diff options
Diffstat (limited to 'spec/services/bulk_imports')
-rw-r--r-- | spec/services/bulk_imports/file_download_service_spec.rb | 1 | ||||
-rw-r--r-- | spec/services/bulk_imports/process_service_spec.rb | 16 |
2 files changed, 4 insertions, 13 deletions
diff --git a/spec/services/bulk_imports/file_download_service_spec.rb b/spec/services/bulk_imports/file_download_service_spec.rb index 0d9fe96bb64..0c3eef69fa5 100644 --- a/spec/services/bulk_imports/file_download_service_spec.rb +++ b/spec/services/bulk_imports/file_download_service_spec.rb @@ -95,7 +95,6 @@ RSpec.describe BulkImports::FileDownloadService, feature_category: :importers do message: 'Invalid content type', response_code: chunk_code, response_headers: headers, - importer: 'gitlab_migration', last_chunk_context: 'some chunk context' ) diff --git a/spec/services/bulk_imports/process_service_spec.rb b/spec/services/bulk_imports/process_service_spec.rb index f5566819039..a295b170c2f 100644 --- a/spec/services/bulk_imports/process_service_spec.rb +++ b/spec/services/bulk_imports/process_service_spec.rb @@ -205,28 +205,20 @@ RSpec.describe BulkImports::ProcessService, feature_category: :importers do it 'logs an info message for the skipped pipelines' do expect_next_instance_of(BulkImports::Logger) do |logger| + expect(logger).to receive(:with_entity).with(entity).and_call_original.twice + expect(logger).to receive(:info).with( message: 'Pipeline skipped as source instance version not compatible with pipeline', - bulk_import_entity_id: entity.id, - bulk_import_id: entity.bulk_import_id, - bulk_import_entity_type: entity.source_type, - source_full_path: entity.source_full_path, pipeline_class: 'PipelineClass4', minimum_source_version: '15.1.0', - maximum_source_version: nil, - source_version: '15.0.0' + maximum_source_version: nil ) expect(logger).to receive(:info).with( message: 'Pipeline skipped as source instance version not compatible with pipeline', - bulk_import_entity_id: entity.id, - bulk_import_id: entity.bulk_import_id, - bulk_import_entity_type: entity.source_type, - source_full_path: entity.source_full_path, pipeline_class: 'PipelineClass5', minimum_source_version: '16.0.0', - maximum_source_version: nil, - source_version: '15.0.0' + maximum_source_version: nil ) end |