Add latest changes from gitlab-org/gitlab@master

2 files changed, 111 insertions, 60 deletions

diff --git a/spec/lib/bulk_imports/groups/stage_spec.rb b/spec/lib/bulk_imports/groups/stage_spec.rb
index 8ce25ff87d7..528d65615b1 100644
--- a/spec/lib/bulk_imports/groups/stage_spec.rb
+++ b/spec/lib/bulk_imports/groups/stage_spec.rb
@@ -4,47 +4,86 @@ require 'spec_helper'
 
 RSpec.describe BulkImports::Groups::Stage do
   let(:ancestor) { create(:group) }
-  let(:group) { create(:group, parent: ancestor) }
+  let(:group) { build(:group, parent: ancestor) }
   let(:bulk_import) { build(:bulk_import) }
-  let(:entity) { build(:bulk_import_entity, bulk_import: bulk_import, group: group, destination_namespace: ancestor.full_path) }
-
-  let(:pipelines) do
-    [
-      [0, BulkImports::Groups::Pipelines::GroupPipeline],
-      [1, BulkImports::Groups::Pipelines::GroupAttributesPipeline],
-      [1, BulkImports::Groups::Pipelines::SubgroupEntitiesPipeline],
-      [1, BulkImports::Groups::Pipelines::NamespaceSettingsPipeline],
-      [1, BulkImports::Common::Pipelines::MembersPipeline],
-      [1, BulkImports::Common::Pipelines::LabelsPipeline],
-      [1, BulkImports::Common::Pipelines::MilestonesPipeline],
-      [1, BulkImports::Common::Pipelines::BadgesPipeline],
-      [2, BulkImports::Common::Pipelines::BoardsPipeline],
-      [2, BulkImports::Common::Pipelines::UploadsPipeline]
-    ]
+  let(:entity) do
+    build(:bulk_import_entity, bulk_import: bulk_import, group: group, destination_namespace: ancestor.full_path)
   end
 
   it 'raises error when initialized without a BulkImport' do
-    expect { described_class.new({}) }.to raise_error(ArgumentError, 'Expected an argument of type ::BulkImports::Entity')
+    expect { described_class.new({}) }.to raise_error(
+      ArgumentError, 'Expected an argument of type ::BulkImports::Entity'
+    )
   end
 
-  describe '.pipelines' do
-    it 'list all the pipelines with their stage number, ordered by stage' do
-      expect(described_class.new(entity).pipelines & pipelines).to contain_exactly(*pipelines)
-      expect(described_class.new(entity).pipelines.last.last).to eq(BulkImports::Common::Pipelines::EntityFinisher)
+  describe '#pipelines' do
+    it 'lists all the pipelines' do
+      pipelines = described_class.new(entity).pipelines
+
+      expect(pipelines).to include(
+        hash_including({
+            pipeline: BulkImports::Groups::Pipelines::GroupPipeline,
+            stage: 0
+          }),
+        hash_including({
+          pipeline: BulkImports::Groups::Pipelines::GroupAttributesPipeline,
+          stage: 1
+        })
+      )
+      expect(pipelines.last).to match(hash_including({ pipeline: BulkImports::Common::Pipelines::EntityFinisher }))
+    end
+
+    it 'only has pipelines with valid keys' do
+      pipeline_keys = described_class.new(entity).pipelines.collect(&:keys).flatten.uniq
+      allowed_keys = %i[pipeline stage minimum_source_version maximum_source_version]
+
+      expect(pipeline_keys - allowed_keys).to be_empty
+    end
+
+    it 'only has pipelines with valid versions' do
+      pipelines = described_class.new(entity).pipelines
+      minimum_source_versions = pipelines.collect { _1[:minimum_source_version] }.flatten.compact
+      maximum_source_versions = pipelines.collect { _1[:maximum_source_version] }.flatten.compact
+      version_regex = /^(\d+)\.(\d+)\.0$/
+
+      expect(minimum_source_versions.all? { version_regex =~ _1 }).to eq(true)
+      expect(maximum_source_versions.all? { version_regex =~ _1 }).to eq(true)
+    end
+
+    context 'when stages are out of order in the config hash' do
+      it 'lists all the pipelines ordered by stage' do
+        allow_next_instance_of(BulkImports::Groups::Stage) do |stage|
+          allow(stage).to receive(:config).and_return(
+            {
+              a: { stage: 2 },
+              b: { stage: 1 },
+              c: { stage: 0 },
+              d: { stage: 2 }
+            }
+          )
+        end
+
+        expected_stages = described_class.new(entity).pipelines.collect { _1[:stage] }
+        expect(expected_stages).to eq([0, 1, 2, 2])
+      end
     end
 
     context 'when bulk_import_projects feature flag is enabled' do
       it 'includes project entities pipeline' do
         stub_feature_flags(bulk_import_projects: true)
 
-        expect(described_class.new(entity).pipelines).to include([1, BulkImports::Groups::Pipelines::ProjectEntitiesPipeline])
+        expect(described_class.new(entity).pipelines).to include(
+          hash_including({ pipeline: BulkImports::Groups::Pipelines::ProjectEntitiesPipeline })
+        )
       end
 
       context 'when feature flag is enabled on root ancestor level' do
         it 'includes project entities pipeline' do
           stub_feature_flags(bulk_import_projects: ancestor)
 
-          expect(described_class.new(entity).pipelines).to include([1, BulkImports::Groups::Pipelines::ProjectEntitiesPipeline])
+          expect(described_class.new(entity).pipelines).to include(
+            hash_including({ pipeline: BulkImports::Groups::Pipelines::ProjectEntitiesPipeline })
+          )
         end
       end
 
@@ -54,7 +93,9 @@ RSpec.describe BulkImports::Groups::Stage do
 
           entity = create(:bulk_import_entity, destination_namespace: '')
 
-          expect(described_class.new(entity).pipelines).to include([1, BulkImports::Groups::Pipelines::ProjectEntitiesPipeline])
+          expect(described_class.new(entity).pipelines).to include(
+            hash_including({ pipeline: BulkImports::Groups::Pipelines::ProjectEntitiesPipeline })
+          )
         end
       end
     end
@@ -63,7 +104,9 @@ RSpec.describe BulkImports::Groups::Stage do
       it 'does not include project entities pipeline' do
         stub_feature_flags(bulk_import_projects: false)
 
-        expect(described_class.new(entity).pipelines.flatten).not_to include(BulkImports::Groups::Pipelines::ProjectEntitiesPipeline)
+        expect(described_class.new(entity).pipelines).not_to include(
+          hash_including({ pipeline: BulkImports::Groups::Pipelines::ProjectEntitiesPipeline })
+        )
       end
     end
   end
diff --git a/spec/lib/bulk_imports/projects/stage_spec.rb b/spec/lib/bulk_imports/projects/stage_spec.rb
index abfc4e1de04..fc670d10655 100644
--- a/spec/lib/bulk_imports/projects/stage_spec.rb
+++ b/spec/lib/bulk_imports/projects/stage_spec.rb
@@ -2,39 +2,7 @@
 
 require 'spec_helper'
 
-# Any new stages must be added to
-# `ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb` as well.
 RSpec.describe BulkImports::Projects::Stage do
-  let(:pipelines) do
-    [
-      [0, BulkImports::Projects::Pipelines::ProjectPipeline],
-      [1, BulkImports::Projects::Pipelines::RepositoryPipeline],
-      [1, BulkImports::Projects::Pipelines::ProjectAttributesPipeline],
-      [2, BulkImports::Common::Pipelines::LabelsPipeline],
-      [2, BulkImports::Common::Pipelines::MilestonesPipeline],
-      [2, BulkImports::Common::Pipelines::BadgesPipeline],
-      [3, BulkImports::Projects::Pipelines::IssuesPipeline],
-      [3, BulkImports::Projects::Pipelines::SnippetsPipeline],
-      [4, BulkImports::Projects::Pipelines::SnippetsRepositoryPipeline],
-      [4, BulkImports::Common::Pipelines::BoardsPipeline],
-      [4, BulkImports::Projects::Pipelines::MergeRequestsPipeline],
-      [4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline],
-      [4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline],
-      [4, BulkImports::Projects::Pipelines::ProjectFeaturePipeline],
-      [4, BulkImports::Projects::Pipelines::ContainerExpirationPolicyPipeline],
-      [4, BulkImports::Projects::Pipelines::ServiceDeskSettingPipeline],
-      [4, BulkImports::Projects::Pipelines::ReleasesPipeline],
-      [5, BulkImports::Projects::Pipelines::CiPipelinesPipeline],
-      [5, BulkImports::Common::Pipelines::WikiPipeline],
-      [5, BulkImports::Common::Pipelines::UploadsPipeline],
-      [5, BulkImports::Common::Pipelines::LfsObjectsPipeline],
-      [5, BulkImports::Projects::Pipelines::DesignBundlePipeline],
-      [5, BulkImports::Projects::Pipelines::AutoDevopsPipeline],
-      [5, BulkImports::Projects::Pipelines::PipelineSchedulesPipeline],
-      [6, BulkImports::Common::Pipelines::EntityFinisher]
-    ]
-  end
-
   subject do
     entity = build(:bulk_import_entity, :project_entity)
 
@@ -42,9 +10,49 @@ RSpec.describe BulkImports::Projects::Stage do
   end
 
   describe '#pipelines' do
-    it 'list all the pipelines with their stage number, ordered by stage' do
-      expect(subject.pipelines & pipelines).to contain_exactly(*pipelines)
-      expect(subject.pipelines.last.last).to eq(BulkImports::Common::Pipelines::EntityFinisher)
+    it 'list all the pipelines' do
+      pipelines = subject.pipelines
+
+      expect(pipelines).to include(
+        hash_including({ stage: 0, pipeline: BulkImports::Projects::Pipelines::ProjectPipeline }),
+        hash_including({ stage: 1, pipeline: BulkImports::Projects::Pipelines::RepositoryPipeline })
+      )
+      expect(pipelines.last).to match(hash_including({ pipeline: BulkImports::Common::Pipelines::EntityFinisher }))
+    end
+
+    it 'only have pipelines with valid keys' do
+      pipeline_keys = subject.pipelines.collect(&:keys).flatten.uniq
+      allowed_keys = %i[pipeline stage minimum_source_version maximum_source_version]
+
+      expect(pipeline_keys - allowed_keys).to be_empty
+    end
+
+    it 'only has pipelines with valid versions' do
+      pipelines = subject.pipelines
+      minimum_source_versions = pipelines.collect { _1[:minimum_source_version] }.flatten.compact
+      maximum_source_versions = pipelines.collect { _1[:maximum_source_version] }.flatten.compact
+      version_regex = /^(\d+)\.(\d+)\.0$/
+
+      expect(minimum_source_versions.all? { version_regex =~ _1 }).to eq(true)
+      expect(maximum_source_versions.all? { version_regex =~ _1 }).to eq(true)
+    end
+
+    context 'when stages are out of order in the config hash' do
+      it 'list all the pipelines ordered by stage' do
+        allow_next_instance_of(BulkImports::Projects::Stage) do |stage|
+          allow(stage).to receive(:config).and_return(
+            {
+              a: { stage: 2 },
+              b: { stage: 1 },
+              c: { stage: 0 },
+              d: { stage: 2 }
+            }
+          )
+        end
+
+        expected_stages = subject.pipelines.collect { _1[:stage] }
+        expect(expected_stages).to eq([0, 1, 2, 2])
+      end
     end
   end
 end