1 files changed, 10 insertions, 66 deletions

diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb
index e17e12cdaf3..1f0c37df101 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb
@@ -1,70 +1,14 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', :reliable, :requires_admin, product_group: :import do
-    describe 'Gitlab migration' do
-      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|
-          usr.api_client = admin_api_client
-          usr.hard_delete_on_api_removal = true
-        end
-      end
-
-      let(:api_client) { Runtime::API::Client.new(user: user) }
-
-      let(:sandbox) do
-        Resource::Sandbox.fabricate_via_api! do |group|
-          group.api_client = admin_api_client
-        end
-      end
-
-      let(:destination_group) do
-        Resource::Group.fabricate_via_api! do |group|
-          group.api_client = api_client
-          group.sandbox = sandbox
-          group.path = "destination-group-for-import-#{SecureRandom.hex(4)}"
-        end
-      end
-
-      let(:source_group) do
-        Resource::Group.fabricate_via_api! do |group|
-          group.api_client = api_client
-          group.sandbox = sandbox
-          group.path = "source-group-for-import-#{SecureRandom.hex(4)}"
-          group.avatar = File.new('qa/fixtures/designs/tanuki.jpg', 'r')
-        end
-      end
-
-      let(:imported_group) do
-        Resource::BulkImportGroup.fabricate_via_api! do |group|
-          group.api_client = api_client
-          group.sandbox = destination_group
-          group.source_group = source_group
-        end
-      end
-
-      let(:import_failures) do
-        imported_group.import_details.sum([]) { |details| details[:failures] }
-      end
-
-      before do
-        sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
-      end
-
-      after do |example|
-        # Checking for failures in the test currently makes test very flaky due to catching unrelated failures
-        # Log failures for easier debugging
-        Runtime::Logger.warn("Import failures: #{import_failures}") if example.exception && !import_failures.empty?
-      ensure
-        user.remove_via_api!
-      end
+  RSpec.describe "Manage", :reliable, product_group: :import do
+    include_context "with gitlab group migration"
 
+    describe "Gitlab migration" do
       context 'with subgroups and labels' do
         let(:subgroup) do
           Resource::Group.fabricate_via_api! do |group|
-            group.api_client = api_client
+            group.api_client = source_admin_api_client
             group.sandbox = source_group
             group.path = "subgroup-for-import-#{SecureRandom.hex(4)}"
           end
@@ -80,12 +24,12 @@ module QA
 
         before do
           Resource::GroupLabel.fabricate_via_api! do |label|
-            label.api_client = api_client
+            label.api_client = source_admin_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.api_client = source_admin_api_client
             label.group = subgroup
             label.title = "subgroup-#{SecureRandom.hex(4)}"
           end
@@ -97,7 +41,7 @@ module QA
           'successfully imports groups and labels',
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347674'
         ) do
-          expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
+          expect_group_import_finished_successfully
 
           aggregate_failures do
             expect(imported_group.reload!).to eq(source_group)
@@ -112,7 +56,7 @@ module QA
       context 'with milestones and badges' do
         let(:source_milestone) do
           Resource::GroupMilestone.fabricate_via_api! do |milestone|
-            milestone.api_client = api_client
+            milestone.api_client = source_admin_api_client
             milestone.group = source_group
           end
         end
@@ -121,7 +65,7 @@ module QA
           source_milestone
 
           Resource::GroupBadge.fabricate_via_api! do |badge|
-            badge.api_client = api_client
+            badge.api_client = source_admin_api_client
             badge.group = source_group
             badge.link_url = "http://example.com/badge"
             badge.image_url = "http://shields.io/badge"
@@ -134,7 +78,7 @@ module QA
           'successfully imports group milestones and badges',
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347628'
         ) do
-          expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
+          expect_group_import_finished_successfully
 
           imported_milestone = imported_group.reload!.milestones.find { |ml| ml.title == source_milestone.title }
           aggregate_failures do