Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/workers/gitlab/bitbucket_server_import/stage/import_repository_worker_spec.rb b/spec/workers/gitlab/bitbucket_server_import/stage/import_repository_worker_spec.rb
index 7ea23041e79..1531b30089c 100644
--- a/spec/workers/gitlab/bitbucket_server_import/stage/import_repository_worker_spec.rb
+++ b/spec/workers/gitlab/bitbucket_server_import/stage/import_repository_worker_spec.rb
@@ -18,12 +18,25 @@ RSpec.describe Gitlab::BitbucketServerImport::Stage::ImportRepositoryWorker, fea
       end
 
       it 'schedules the next stage' do
-        expect(Gitlab::BitbucketServerImport::Stage::ImportPullRequestsWorker).to receive(:perform_async)
+        expect(Gitlab::BitbucketServerImport::Stage::ImportUsersWorker).to receive(:perform_async)
           .with(project.id)
 
         worker.perform(project.id)
       end
 
+      context 'when the bitbucket_server_convert_mentions_to_users flag is disabled' do
+        before do
+          stub_feature_flags(bitbucket_server_convert_mentions_to_users: false)
+        end
+
+        it 'skips the user import and schedules the next stage' do
+          expect(Gitlab::BitbucketServerImport::Stage::ImportPullRequestsWorker).to receive(:perform_async)
+            .with(project.id)
+
+          worker.perform(project.id)
+        end
+      end
+
       it 'logs stage start and finish' do
         expect(Gitlab::BitbucketServerImport::Logger)
           .to receive(:info).with(hash_including(message: 'starting stage', project_id: project.id))