2 files changed, 48 insertions, 1 deletions
diff --git a/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb b/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb
index 27d94b04cde..481a09f601b 100644
--- a/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb
+++ b/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb
@@ -35,8 +35,44 @@ module QA
       end
     end
 
+    let(:smocker_host) { ENV["QA_SMOCKER_HOST"] }
+    let(:smocker) do
+      Vendor::Smocker::SmockerApi.new(
+        host: smocker_host,
+        public_port: 443,
+        admin_port: 8081,
+        tls: true
+      )
+    end
+
+    let(:mocks_path) { File.join(Runtime::Path.fixtures_path, "mocks", "import") }
+
     before do
+      set_mocks
       group.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
     end
+
+    def expect_project_import_finished_successfully
+      imported_project.reload! # import the project
+
+      status = nil
+      Support::Retrier.retry_until(max_duration: 240, sleep_interval: 1, raise_on_failure: false) do
+        status = imported_project.project_import_status[:import_status]
+        %w[finished failed].include?(status)
+      end
+
+      # finished status means success, all other statuses are considered to fail the test
+      expect(status).to eq('finished'), "Expected import to finish successfully, but status was: #{status}"
+    end
+
+    # Setup github mocked responses if mock server host is present
+    #
+    # @return [void]
+    def set_mocks
+      return Runtime::Logger.warn("Mock host is not set, skipping github response setup") unless smocker_host
+
+      smocker.reset
+      smocker.register(File.read(File.join(mocks_path, "github.yml")))
+    end
   end
 end
diff --git a/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb b/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb
index e1d762f41cb..853f427db12 100644
--- a/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb
+++ b/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb
@@ -19,6 +19,9 @@ module QA
         is_new_session: false
       )
     end
+    let!(:source_bulk_import_enabled) do
+      Runtime::ApplicationSettings.get_application_settings(api_client: source_admin_api_client)[:bulk_import_enabled]
+    end
     let!(:source_admin_user) do
       Resource::User.fabricate_via_api! do |usr|
         usr.api_client = source_admin_api_client
@@ -36,6 +39,9 @@ module QA
     # target instance objects
     #
     let!(:admin_api_client) { Runtime::API::Client.as_admin }
+    let!(:target_bulk_import_enabled) do
+      Runtime::ApplicationSettings.get_application_settings(api_client: admin_api_client)[:bulk_import_enabled]
+    end
     let!(:admin_user) do
       Resource::User.fabricate_via_api! do |usr|
         usr.api_client = admin_api_client
@@ -87,7 +93,8 @@ module QA
     end
 
     before do
-      Runtime::ApplicationSettings.set_application_settings(bulk_import_enabled: true)
+      enable_bulk_import(source_admin_api_client) if source_admin_user && !source_bulk_import_enabled
+      enable_bulk_import(admin_api_client) unless target_bulk_import_enabled
 
       target_sandbox.add_member(user, Resource::Members::AccessLevel::OWNER)
     end
@@ -102,5 +109,9 @@ module QA
       # make sure cleanup runs last
       cleanup!
     end
+
+    def enable_bulk_import(api_client)
+      Runtime::ApplicationSettings.set_application_settings(api_client: api_client, bulk_import_enabled: true)
+    end
   end
 end