Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 6 deletions

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 5f52d48e9f6..afe88fc0cdc 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -202,7 +202,9 @@ module QA
 
         def has_pipeline_status?(text)
           # Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
-          has_element?(:merge_request_pipeline_info_content, text: text, wait: 60)
+          wait_until(sleep_interval: 5, reload: false) do
+            has_element?(:merge_request_pipeline_info_content, text: text, wait: 15 )
+          end
         end
 
         def has_title?(title)
@@ -236,7 +238,10 @@ module QA
         end
 
         def merged?
-          # Revisit after merge page re-architect is done https://gitlab.com/gitlab-org/gitlab/-/issues/300042
+          # Reloads the page at this point to avoid the problem of the merge status failing to update
+          # That's the transient UX issue this test is checking for, so if the MR is merged but the UI still shows the
+          # status as unmerged, the test will fail.
+          # Revisit after merge page re-architect is done https://gitlab.com/groups/gitlab-org/-/epics/5598
           # To remove page refresh logic if possible
           retry_until(max_attempts: 3, reload: true) do
             has_element?(:merged_status_content, text: 'The changes were merged into', wait: 20)
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
index 01aada2d6dd..b43581289ef 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
@@ -73,7 +73,7 @@ module QA
       it 'can still merge MR successfully', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/971' do
         Page::MergeRequest::Show.perform do |show|
           # waiting for manual action status shows status badge 'blocked' on pipelines page
-          show.wait_until(reload: false) { show.has_pipeline_status?('waiting for manual action') }
+          show.has_pipeline_status?('waiting for manual action')
           show.merge!
 
           expect(show).to be_merged
diff --git a/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb
index 07484feb686..7d3f8f2b1d4 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb
@@ -39,9 +39,7 @@ module QA
         merge_request.visit!
 
         Page::MergeRequest::Show.perform do |mr_widget|
-          Support::Retrier.retry_until(max_attempts: 5, sleep_interval: 5) do
-            mr_widget.has_pipeline_status?('passed')
-          end
+          mr_widget.has_pipeline_status?('passed')
           expect(mr_widget).to have_content('Test coverage 66.67%')
         end
       end