Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 18 insertions, 12 deletions

diff --git a/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb b/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb
index b5252294b27..3cd82b8bf4d 100644
--- a/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb
+++ b/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb
@@ -83,19 +83,23 @@ RSpec.describe Gitlab::GithubImport::ObjectImporter, :aggregate_failures do
       expect(Gitlab::GithubImport::Logger)
         .to receive(:info)
         .with(
-          github_identifiers: github_identifiers,
-          message: 'starting importer',
-          project_id: project.id,
-          importer: 'klass_name'
+          {
+            github_identifiers: github_identifiers,
+            message: 'starting importer',
+            project_id: project.id,
+            importer: 'klass_name'
+          }
         )
 
       expect(Gitlab::GithubImport::Logger)
         .to receive(:info)
         .with(
-          github_identifiers: github_identifiers,
-          message: 'importer finished',
-          project_id: project.id,
-          importer: 'klass_name'
+          {
+            github_identifiers: github_identifiers,
+            message: 'importer finished',
+            project_id: project.id,
+            importer: 'klass_name'
+          }
         )
 
       worker.import(project, client, { 'number' => 10, 'github_id' => 1 })
@@ -120,10 +124,12 @@ RSpec.describe Gitlab::GithubImport::ObjectImporter, :aggregate_failures do
       expect(Gitlab::GithubImport::Logger)
         .to receive(:info)
         .with(
-          github_identifiers: github_identifiers,
-          message: 'starting importer',
-          project_id: project.id,
-          importer: 'klass_name'
+          {
+            github_identifiers: github_identifiers,
+            message: 'starting importer',
+            project_id: project.id,
+            importer: 'klass_name'
+          }
         )
 
       expect(Gitlab::Import::ImportFailureService)