Merge branch '433139-fix-bug' into 'master'

Bitbucket importer: fix undefined method `key'

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138282



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Approved-by: Adam Hegyi <ahegyi@gitlab.com>
Approved-by: Carla Drago <cdrago@gitlab.com>
Reviewed-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: maddievn <mvanniekerk@gitlab.com>

lib/gitlab/bitbucket_import/importers/issues_importer.rb

@@ -33,6 +33,7 @@ def execute
           job_waiter
         rescue StandardError => e
           track_import_failure!(project, exception: e)
+          job_waiter
         end
 
         private

lib/gitlab/bitbucket_import/importers/issues_notes_importer.rb

@@ -22,6 +22,7 @@ def execute
           job_waiter
         rescue StandardError => e
           track_import_failure!(project, exception: e)
+          job_waiter
         end
 
         private

lib/gitlab/bitbucket_import/importers/pull_requests_importer.rb

@@ -26,6 +26,7 @@ def execute
           job_waiter
         rescue StandardError => e
           track_import_failure!(project, exception: e)
+          job_waiter
         end
 
         private

lib/gitlab/bitbucket_import/importers/pull_requests_notes_importer.rb

@@ -22,6 +22,7 @@ def execute
           job_waiter
         rescue StandardError => e
           track_import_failure!(project, exception: e)
+          job_waiter
         end
 
         private

spec/lib/gitlab/bitbucket_import/importers/issues_importer_spec.rb

@@ -67,7 +67,7 @@
       it 'tracks the failure and does not fail' do
         expect(Gitlab::Import::ImportFailureService).to receive(:track).once
 
-        importer.execute
+        expect(importer.execute).to be_a(Gitlab::JobWaiter)
       end
     end
 

spec/lib/gitlab/bitbucket_import/importers/issues_notes_importer_spec.rb

@@ -29,7 +29,7 @@
       it 'tracks the failure and does not fail' do
         expect(Gitlab::Import::ImportFailureService).to receive(:track).once
 
-        importer.execute
+        expect(importer.execute).to be_a(Gitlab::JobWaiter)
       end
     end
 

spec/lib/gitlab/bitbucket_import/importers/pull_requests_importer_spec.rb

@@ -49,7 +49,7 @@
       it 'tracks the failure and does not fail' do
         expect(Gitlab::Import::ImportFailureService).to receive(:track).once
 
-        importer.execute
+        expect(importer.execute).to be_a(Gitlab::JobWaiter)
       end
     end
 

spec/lib/gitlab/bitbucket_import/importers/pull_requests_notes_importer_spec.rb

@@ -29,7 +29,7 @@
       it 'tracks the failure and does not fail' do
         expect(Gitlab::Import::ImportFailureService).to receive(:track).once
 
-        importer.execute
+        expect(importer.execute).to be_a(Gitlab::JobWaiter)
       end
     end