1 files changed, 23 insertions, 31 deletions

diff --git a/spec/lib/gitlab/import_sources_spec.rb b/spec/lib/gitlab/import_sources_spec.rb
index b243780a020..db23e3b1fd4 100644
--- a/spec/lib/gitlab/import_sources_spec.rb
+++ b/spec/lib/gitlab/import_sources_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe Gitlab::ImportSources, feature_category: :importers do
   describe '.importer' do
     import_sources = {
       'github' => Gitlab::GithubImport::ParallelImporter,
-      'bitbucket' => Gitlab::BitbucketImport::Importer,
+      'bitbucket' => Gitlab::BitbucketImport::ParallelImporter,
       'bitbucket_server' => Gitlab::BitbucketServerImport::ParallelImporter,
       'fogbugz' => Gitlab::FogbugzImport::Importer,
       'git' => nil,
@@ -72,45 +72,37 @@ RSpec.describe Gitlab::ImportSources, feature_category: :importers do
         expect(described_class.importer(name)).to eq(klass)
       end
     end
-
-    context 'when flag is disabled' do
-      before do
-        stub_feature_flags(bitbucket_server_parallel_importer: false)
-      end
-
-      it 'returns Gitlab::BitbucketServerImport::Importer when given bitbucket_server' do
-        expect(described_class.importer('bitbucket_server')).to eq(Gitlab::BitbucketServerImport::Importer)
-      end
-    end
   end
 
   describe '.import_table' do
     subject { described_class.import_table }
 
-    it 'returns the ParallelImporter for Bitbucket server' do
-      is_expected.to include(
-        described_class::ImportSource.new(
-          'bitbucket_server',
-          'Bitbucket Server',
-          Gitlab::BitbucketServerImport::ParallelImporter
-        )
-      )
-    end
-
-    context 'when flag is disabled' do
-      before do
-        stub_feature_flags(bitbucket_server_parallel_importer: false)
-      end
-
-      it 'returns the legacy Importer for Bitbucket server' do
+    describe 'Bitbucket cloud' do
+      it 'returns the ParallelImporter' do
         is_expected.to include(
           described_class::ImportSource.new(
-            'bitbucket_server',
-            'Bitbucket Server',
-            Gitlab::BitbucketServerImport::Importer
+            'bitbucket',
+            'Bitbucket Cloud',
+            Gitlab::BitbucketImport::ParallelImporter
           )
         )
       end
+
+      context 'when flag is disabled' do
+        before do
+          stub_feature_flags(bitbucket_parallel_importer: false)
+        end
+
+        it 'returns the legacy Importer' do
+          is_expected.to include(
+            described_class::ImportSource.new(
+              'bitbucket',
+              'Bitbucket Cloud',
+              Gitlab::BitbucketImport::Importer
+            )
+          )
+        end
+      end
     end
   end
 
@@ -134,7 +126,7 @@ RSpec.describe Gitlab::ImportSources, feature_category: :importers do
   end
 
   describe 'imports_repository? checker' do
-    let(:allowed_importers) { %w[github gitlab_project bitbucket_server] }
+    let(:allowed_importers) { %w[github gitlab_project bitbucket bitbucket_server] }
 
     it 'fails if any importer other than the allowed ones implements this method' do
       current_importers = described_class.values.select { |kind| described_class.importer(kind).try(:imports_repository?) }