1 files changed, 69 insertions, 44 deletions

diff --git a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
index 6bbb859b3ee..1422dd5a029 100644
--- a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
@@ -5,6 +5,7 @@ module QA
     describe 'Bulk group import' do
       let!(:staging?) { Runtime::Scenario.gitlab_address.include?('staging.gitlab.com') }
 
+      let(:import_wait_duration) { { max_duration: 300, sleep_interval: 2 } }
       let(:admin_api_client) { Runtime::API::Client.as_admin }
       let(:user) do
         Resource::User.fabricate_via_api! do |usr|
@@ -14,7 +15,6 @@ module QA
       end
 
       let(:api_client) { Runtime::API::Client.new(user: user) }
-      let(:personal_access_token) { api_client.personal_access_token }
 
       let(:sandbox) do
         Resource::Sandbox.fabricate_via_api! do |group|
@@ -29,22 +29,6 @@ module QA
         end
       end
 
-      let(:subgroup) do
-        Resource::Group.fabricate_via_api! do |group|
-          group.api_client = api_client
-          group.sandbox = source_group
-          group.path = "subgroup-for-import-#{SecureRandom.hex(4)}"
-        end
-      end
-
-      let(:imported_subgroup) do
-        Resource::Group.init do |group|
-          group.api_client = api_client
-          group.sandbox = imported_group
-          group.path = subgroup.path
-        end
-      end
-
       let(:imported_group) do
         Resource::BulkImportGroup.fabricate_via_api! do |group|
           group.api_client = api_client
@@ -54,47 +38,88 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(:bulk_import) unless staging?
         Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
 
         sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
+      end
 
-        Resource::GroupLabel.fabricate_via_api! do |label|
-          label.api_client = api_client
-          label.group = source_group
-          label.title = "source-group-#{SecureRandom.hex(4)}"
+      context 'with subgroups and labels' do
+        let(:subgroup) do
+          Resource::Group.fabricate_via_api! do |group|
+            group.api_client = api_client
+            group.sandbox = source_group
+            group.path = "subgroup-for-import-#{SecureRandom.hex(4)}"
+          end
         end
-        Resource::GroupLabel.fabricate_via_api! do |label|
-          label.api_client = api_client
-          label.group = subgroup
-          label.title = "subgroup-#{SecureRandom.hex(4)}"
+
+        let(:imported_subgroup) do
+          Resource::Group.init do |group|
+            group.api_client = api_client
+            group.sandbox = imported_group
+            group.path = subgroup.path
+          end
+        end
+
+        before do
+          Resource::GroupLabel.fabricate_via_api! do |label|
+            label.api_client = api_client
+            label.group = source_group
+            label.title = "source-group-#{SecureRandom.hex(4)}"
+          end
+          Resource::GroupLabel.fabricate_via_api! do |label|
+            label.api_client = api_client
+            label.group = subgroup
+            label.title = "subgroup-#{SecureRandom.hex(4)}"
+          end
+        end
+
+        it(
+          'successfully imports groups and labels',
+          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1873'
+        ) do
+          expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
+
+          aggregate_failures do
+            expect(imported_group.reload!).to eq(source_group)
+            expect(imported_group.labels).to include(*source_group.labels)
+
+            expect(imported_subgroup.reload!).to eq(subgroup)
+            expect(imported_subgroup.labels).to include(*subgroup.labels)
+          end
         end
       end
 
-      # Non blocking issues:
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/331252
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/333678 <- can cause 500 when creating user and group back to back
-      it(
-        'imports group with subgroups and labels',
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1871'
-      ) do
-        expect { imported_group.import_status }.to(
-          eventually_eq('finished').within(max_duration: 300, sleep_interval: 2)
-        )
-
-        aggregate_failures do
-          expect(imported_group.reload!).to eq(source_group)
-          expect(imported_group.labels).to include(*source_group.labels)
-
-          expect(imported_subgroup.reload!).to eq(subgroup)
-          expect(imported_subgroup.labels).to include(*subgroup.labels)
+      context 'with milestones' do
+        let(:source_milestone) do
+          Resource::GroupMilestone.fabricate_via_api! do |milestone|
+            milestone.api_client = api_client
+            milestone.group = source_group
+          end
+        end
+
+        before do
+          source_milestone
+        end
+
+        it(
+          'successfully imports group milestones',
+          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2245'
+        ) do
+          expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
+
+          imported_milestone = imported_group.reload!.milestones.find { |ml| ml.title == source_milestone.title }
+          aggregate_failures do
+            expect(imported_milestone).to eq(source_milestone)
+            expect(imported_milestone.iid).to eq(source_milestone.iid)
+            expect(imported_milestone.created_at).to eq(source_milestone.created_at)
+            expect(imported_milestone.updated_at).to eq(source_milestone.updated_at)
+          end
         end
       end
 
       after do
         user.remove_via_api!
       ensure
-        Runtime::Feature.disable(:bulk_import) unless staging?
         Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
       end
     end