Merge branch 'tomi/120721/new_large_mr_tests' into 'master'

LMR QA | Main | Adding additional tests

See merge request gitlab-org/gitlab!66069

qa/qa/page/component/import/gitlab.rb

@@ -5,6 +5,8 @@ module QA
     module Component
       module Import
         module Gitlab
+          extend QA::Page::PageConcern
+
           def self.included(base)
             super
 
@@ -30,7 +32,7 @@ module QA
             click_element(:import_project_button)
 
             wait_until(reload: false) do
-              has_notice?("The project was successfully imported.")
+              has_notice?("The project was successfully imported.") || has_element?(:project_name_content)
             end
           end
         end

qa/qa/resource/merge_request.rb

@@ -152,7 +152,8 @@ module QA
         @project = Resource::ImportProject.fabricate_via_browser_ui!
         # Setting the name here, since otherwise some tests will look for an existing file in
         # the proejct without ever knowing what is in it.
-        @file_name = "github_controller_spec.rb"
+        @file_name = "added_file-00000000.txt"
+        @source_branch = "large_merge_request"
         visit("#{project.web_url}/-/merge_requests/1")
         current_url
       end

qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb

@@ -15,7 +15,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'views the merge request email patches', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1689' do
+      it 'views the merge request email patches', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1689' do
         Page::MergeRequest::Show.perform(&:view_email_patches)
 
         expect(page.text).to start_with('From')
@@ -23,10 +23,11 @@ module QA
         expect(page).to have_content("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
       end
 
-      it 'views the merge request plain diff', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/417' do
+      it 'views the merge request plain diff', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/417' do
         Page::MergeRequest::Show.perform(&:view_plain_diff)
 
-        expect(page.text).to start_with("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
+        expect(page.text).to start_with('diff')
+        expect(page).to have_content("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
         expect(page).to have_content('+File Added')
       end
     end