Add latest changes from gitlab-org/gitlab@master

6 files changed, 134 insertions, 139 deletions

diff --git a/spec/lib/bulk_imports/common/pipelines/badges_pipeline_spec.rb b/spec/lib/bulk_imports/common/pipelines/badges_pipeline_spec.rb
new file mode 100644
index 00000000000..6c5465c8a66
--- /dev/null
+++ b/spec/lib/bulk_imports/common/pipelines/badges_pipeline_spec.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BulkImports::Common::Pipelines::BadgesPipeline do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project) }
+
+  let(:entity) { create(:bulk_import_entity, group: group) }
+  let(:tracker) { create(:bulk_import_tracker, entity: entity) }
+  let(:context) { BulkImports::Pipeline::Context.new(tracker) }
+
+  subject(:pipeline) { described_class.new(context) }
+
+  describe '#run' do
+    let(:first_page) { extracted_data(has_next_page: true) }
+    let(:last_page) { extracted_data(name: 'badge2') }
+
+    before do
+      allow_next_instance_of(BulkImports::Common::Extractors::RestExtractor) do |extractor|
+        allow(extractor).to receive(:extract).and_return(first_page, last_page)
+      end
+    end
+
+    it 'imports a group badge' do
+      expect { pipeline.run }.to change(Badge, :count).by(2)
+
+      badge = group.badges.last
+
+      expect(badge.name).to eq('badge2')
+      expect(badge.link_url).to eq(badge_data['link_url'])
+      expect(badge.image_url).to eq(badge_data['image_url'])
+    end
+
+    context 'when project entity' do
+      let(:first_page) { extracted_data(has_next_page: true) }
+      let(:last_page) { extracted_data(name: 'badge2', kind: 'project') }
+      let(:entity) { create(:bulk_import_entity, :project_entity, project: project) }
+
+      it 'imports a project badge & skips group badge' do
+        expect { pipeline.run }.to change(Badge, :count).by(1)
+
+        badge = project.badges.last
+
+        expect(badge.name).to eq('badge2')
+        expect(badge.link_url).to eq(badge_data['link_url'])
+        expect(badge.image_url).to eq(badge_data['image_url'])
+        expect(badge.type).to eq('ProjectBadge')
+      end
+    end
+
+    describe '#transform' do
+      it 'return transformed badge hash' do
+        badge = subject.transform(context, badge_data)
+
+        expect(badge[:name]).to eq('badge')
+        expect(badge[:link_url]).to eq(badge_data['link_url'])
+        expect(badge[:image_url]).to eq(badge_data['image_url'])
+        expect(badge.keys).to contain_exactly(:name, :link_url, :image_url)
+      end
+
+      context 'when data is blank' do
+        it 'does nothing when the data is blank' do
+          expect(subject.transform(context, nil)).to be_nil
+        end
+      end
+
+      context 'when project entity & group badge' do
+        let(:entity) { create(:bulk_import_entity, :project_entity, project: project) }
+
+        it 'returns' do
+          expect(subject.transform(context, { 'name' => 'test', 'kind' => 'group' })).to be_nil
+        end
+      end
+    end
+
+    def badge_data(name = 'badge', kind = 'group')
+      {
+        'name' => name,
+        'link_url' => 'https://gitlab.example.com',
+        'image_url' => 'https://gitlab.example.com/image.png',
+        'kind' => kind
+      }
+    end
+
+    def extracted_data(name: 'badge', kind: 'group', has_next_page: false)
+      page_info = {
+        'has_next_page' => has_next_page,
+        'next_page' => has_next_page ? '2' : nil
+      }
+
+      BulkImports::Pipeline::ExtractedData.new(data: [badge_data(name, kind)], page_info: page_info)
+    end
+  end
+end
diff --git a/spec/lib/bulk_imports/common/rest/get_badges_query_spec.rb b/spec/lib/bulk_imports/common/rest/get_badges_query_spec.rb
new file mode 100644
index 00000000000..0a04c0a2243
--- /dev/null
+++ b/spec/lib/bulk_imports/common/rest/get_badges_query_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BulkImports::Common::Rest::GetBadgesQuery do
+  describe '.to_h' do
+    shared_examples 'resource and page info query' do
+      let(:tracker) { create(:bulk_import_tracker, entity: entity) }
+      let(:context) { BulkImports::Pipeline::Context.new(tracker) }
+      let(:encoded_full_path) { ERB::Util.url_encode(entity.source_full_path) }
+
+      it 'returns correct query and page info' do
+        expected = {
+          resource: [entity.pluralized_name, encoded_full_path, 'badges'].join('/'),
+          query: {
+            page: context.tracker.next_page
+          }
+        }
+
+        expect(described_class.to_h(context)).to eq(expected)
+      end
+    end
+
+    context 'when entity is group' do
+      let(:entity) { create(:bulk_import_entity) }
+
+      include_examples 'resource and page info query'
+    end
+
+    context 'when entity is project' do
+      let(:entity) { create(:bulk_import_entity, :project_entity) }
+
+      include_examples 'resource and page info query'
+    end
+  end
+end
diff --git a/spec/lib/bulk_imports/groups/pipelines/badges_pipeline_spec.rb b/spec/lib/bulk_imports/groups/pipelines/badges_pipeline_spec.rb
deleted file mode 100644
index 9fa35c4707d..00000000000
--- a/spec/lib/bulk_imports/groups/pipelines/badges_pipeline_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe BulkImports::Groups::Pipelines::BadgesPipeline do
-  let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group) }
-
-  let_it_be(:entity) do
-    create(
-      :bulk_import_entity,
-      source_full_path: 'source/full/path',
-      destination_name: 'My Destination Group',
-      destination_namespace: group.full_path,
-      group: group
-    )
-  end
-
-  let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
-  let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
-
-  subject { described_class.new(context) }
-
-  describe '#run' do
-    it 'imports a group badge' do
-      first_page = extracted_data(has_next_page: true)
-      last_page  = extracted_data(name: 'badge2')
-
-      allow_next_instance_of(BulkImports::Common::Extractors::RestExtractor) do |extractor|
-        allow(extractor)
-          .to receive(:extract)
-          .and_return(first_page, last_page)
-      end
-
-      expect { subject.run }.to change(Badge, :count).by(2)
-
-      badge = group.badges.last
-
-      expect(badge.name).to eq('badge2')
-      expect(badge.link_url).to eq(badge_data['link_url'])
-      expect(badge.image_url).to eq(badge_data['image_url'])
-    end
-
-    describe '#load' do
-      it 'creates a badge' do
-        expect { subject.load(context, badge_data) }.to change(Badge, :count).by(1)
-
-        badge = group.badges.first
-
-        badge_data.each do |key, value|
-          expect(badge[key]).to eq(value)
-        end
-      end
-
-      it 'does nothing when the data is blank' do
-        expect { subject.load(context, nil) }.not_to change(Badge, :count)
-      end
-    end
-
-    describe '#transform' do
-      it 'return transformed badge hash' do
-        badge = subject.transform(context, badge_data)
-
-        expect(badge[:name]).to eq('badge')
-        expect(badge[:link_url]).to eq(badge_data['link_url'])
-        expect(badge[:image_url]).to eq(badge_data['image_url'])
-        expect(badge.keys).to contain_exactly(:name, :link_url, :image_url)
-      end
-
-      context 'when data is blank' do
-        it 'does nothing when the data is blank' do
-          expect(subject.transform(context, nil)).to be_nil
-        end
-      end
-    end
-
-    describe 'pipeline parts' do
-      it { expect(described_class).to include_module(BulkImports::Pipeline) }
-      it { expect(described_class).to include_module(BulkImports::Pipeline::Runner) }
-
-      it 'has extractors' do
-        expect(described_class.get_extractor)
-          .to eq(
-            klass: BulkImports::Common::Extractors::RestExtractor,
-            options: {
-              query: BulkImports::Groups::Rest::GetBadgesQuery
-            }
-          )
-      end
-
-      it 'has transformers' do
-        expect(described_class.transformers)
-          .to contain_exactly(
-            { klass: BulkImports::Common::Transformers::ProhibitedAttributesTransformer, options: nil }
-          )
-      end
-    end
-
-    def badge_data(name = 'badge')
-      {
-        'name' => name,
-        'link_url' => 'https://gitlab.example.com',
-        'image_url' => 'https://gitlab.example.com/image.png'
-      }
-    end
-
-    def extracted_data(name: 'badge', has_next_page: false)
-      page_info = {
-        'has_next_page' => has_next_page,
-        'next_page' => has_next_page ? '2' : nil
-      }
-
-      BulkImports::Pipeline::ExtractedData.new(data: [badge_data(name)], page_info: page_info)
-    end
-  end
-end
diff --git a/spec/lib/bulk_imports/groups/rest/get_badges_query_spec.rb b/spec/lib/bulk_imports/groups/rest/get_badges_query_spec.rb
deleted file mode 100644
index eef6848e118..00000000000
--- a/spec/lib/bulk_imports/groups/rest/get_badges_query_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe BulkImports::Groups::Rest::GetBadgesQuery do
-  describe '.to_h' do
-    it 'returns query resource and page info' do
-      entity = create(:bulk_import_entity)
-      tracker = create(:bulk_import_tracker, entity: entity)
-      context = BulkImports::Pipeline::Context.new(tracker)
-      encoded_full_path = ERB::Util.url_encode(entity.source_full_path)
-      expected = {
-        resource: ['groups', encoded_full_path, 'badges'].join('/'),
-        query: {
-          page: context.tracker.next_page
-        }
-      }
-
-      expect(described_class.to_h(context)).to eq(expected)
-    end
-  end
-end
diff --git a/spec/lib/bulk_imports/groups/stage_spec.rb b/spec/lib/bulk_imports/groups/stage_spec.rb
index 5719acac4d7..a7acd661282 100644
--- a/spec/lib/bulk_imports/groups/stage_spec.rb
+++ b/spec/lib/bulk_imports/groups/stage_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe BulkImports::Groups::Stage do
       [1, BulkImports::Groups::Pipelines::MembersPipeline],
       [1, BulkImports::Common::Pipelines::LabelsPipeline],
       [1, BulkImports::Common::Pipelines::MilestonesPipeline],
-      [1, BulkImports::Groups::Pipelines::BadgesPipeline],
+      [1, BulkImports::Common::Pipelines::BadgesPipeline],
       [2, BulkImports::Common::Pipelines::BoardsPipeline]
     ]
   end
diff --git a/spec/lib/bulk_imports/projects/stage_spec.rb b/spec/lib/bulk_imports/projects/stage_spec.rb
index cbc0ea667b7..ee197cb1c29 100644
--- a/spec/lib/bulk_imports/projects/stage_spec.rb
+++ b/spec/lib/bulk_imports/projects/stage_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe BulkImports::Projects::Stage do
       [1, BulkImports::Projects::Pipelines::RepositoryPipeline],
       [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::Common::Pipelines::BoardsPipeline],