Add latest changes from gitlab-org/gitlab@16-0-stable-ee

2 files changed, 87 insertions, 0 deletions

diff --git a/spec/support/shared_examples/lib/gitlab/bitbucket_server_import/object_import_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/bitbucket_server_import/object_import_shared_examples.rb
new file mode 100644
index 00000000000..ec2ae0b8a73
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/bitbucket_server_import/object_import_shared_examples.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples Gitlab::BitbucketServerImport::ObjectImporter do
+  include AfterNextHelpers
+
+  describe '.sidekiq_retries_exhausted' do
+    let(:job) { { 'args' => [1, {}, 'key'], 'jid' => 'jid' } }
+
+    it 'notifies the waiter' do
+      expect(Gitlab::JobWaiter).to receive(:notify).with('key', 'jid')
+
+      described_class.sidekiq_retries_exhausted_block.call(job, StandardError.new)
+    end
+  end
+
+  describe '#perform' do
+    let_it_be(:import_started_project) { create(:project, :import_started) }
+
+    let(:project_id) { project_id }
+    let(:waiter_key) { 'key' }
+
+    shared_examples 'notifies the waiter' do
+      specify do
+        allow_next(worker.importer_class).to receive(:execute)
+
+        expect(Gitlab::JobWaiter).to receive(:notify).with(waiter_key, anything)
+
+        worker.perform(project_id, {}, waiter_key)
+      end
+    end
+
+    context 'when project does not exist' do
+      let(:project_id) { non_existing_record_id }
+
+      it_behaves_like 'notifies the waiter'
+    end
+
+    context 'when project has import started' do
+      let_it_be(:project) do
+        create(:project, :import_started, import_data_attributes: {
+          data: { 'project_key' => 'key', 'repo_slug' => 'slug' },
+          credentials: { 'token' => 'token' }
+        })
+      end
+
+      let(:project_id) { project.id }
+
+      it 'calls the importer' do
+        expect_next(worker.importer_class, project, kind_of(Hash)).to receive(:execute)
+
+        worker.perform(project_id, {}, waiter_key)
+      end
+
+      it_behaves_like 'notifies the waiter'
+    end
+
+    context 'when project import has been cancelled' do
+      let_it_be(:project_id) { create(:project, :import_canceled).id }
+
+      it 'does not call the importer' do
+        expect_next(worker.importer_class).not_to receive(:execute)
+
+        worker.perform(project_id, {}, waiter_key)
+      end
+
+      it_behaves_like 'notifies the waiter'
+    end
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/bitbucket_server_import/stage_methods_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/bitbucket_server_import/stage_methods_shared_examples.rb
new file mode 100644
index 00000000000..1246dd2979b
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/bitbucket_server_import/stage_methods_shared_examples.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples Gitlab::BitbucketServerImport::StageMethods do
+  describe '.sidekiq_retries_exhausted' do
+    let(:job) { { 'args' => [project.id] } }
+
+    it 'tracks the import failure' do
+      expect(Gitlab::Import::ImportFailureService)
+        .to receive(:track).with(
+          project_id: project.id,
+          exception: StandardError.new,
+          fail_import: true
+        )
+
+      described_class.sidekiq_retries_exhausted_block.call(job, StandardError.new)
+    end
+  end
+end