Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 6 insertions, 28 deletions

diff --git a/spec/features/groups/import_export/connect_instance_spec.rb b/spec/features/groups/import_export/connect_instance_spec.rb
index cf893e444c4..552b599a3f3 100644
--- a/spec/features/groups/import_export/connect_instance_spec.rb
+++ b/spec/features/groups/import_export/connect_instance_spec.rb
@@ -19,34 +19,12 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do
   end
 
   context 'when the user provides valid credentials' do
+    source_url = 'https://gitlab.com'
+
+    include_context 'bulk imports requests context', source_url
+
     it 'successfully connects to remote instance' do
-      source_url = 'https://gitlab.com'
       pat = 'demo-pat'
-      stub_path = 'stub-group'
-      total = 37
-
-      stub_request(:get, "%{url}/api/v4/groups?page=1&per_page=20&top_level_only=true&min_access_level=50&search=" % { url: source_url }).to_return(
-        body: [{
-          id: 2595438,
-          web_url: 'https://gitlab.com/groups/auto-breakfast',
-          name: 'Stub',
-          path: stub_path,
-          full_name: 'Stub',
-          full_path: stub_path
-        }].to_json,
-        headers: {
-          'Content-Type' => 'application/json',
-          'X-Next-Page' => 2,
-          'X-Page' => 1,
-          'X-Per-Page' => 20,
-          'X-Total' => total,
-          'X-Total-Pages' => 2
-        }
-      )
-
-      allow_next_instance_of(BulkImports::Clients::HTTP) do |client|
-        allow(client).to receive(:validate_instance_version!).and_return(true)
-      end
 
       expect(page).to have_content 'Import groups from another instance of GitLab'
       expect(page).to have_content 'Not all related objects are migrated'
@@ -56,8 +34,8 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do
 
       click_on 'Connect instance'
 
-      expect(page).to have_content 'Showing 1-1 of %{total} groups from %{url}' % { url: source_url, total: total }
-      expect(page).to have_content stub_path
+      expect(page).to have_content 'Showing 1-1 of 42 groups from %{url}' % { url: source_url }
+      expect(page).to have_content 'stub-group'
 
       visit '/'