Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 8 insertions, 2 deletions

diff --git a/qa/qa/page/project/pipeline/index.rb b/qa/qa/page/project/pipeline/index.rb
index aff2378330a..0f5a7e8c801 100644
--- a/qa/qa/page/project/pipeline/index.rb
+++ b/qa/qa/page/project/pipeline/index.rb
@@ -22,15 +22,17 @@ module QA
             all_elements(:pipeline_url_link, minimum: 1, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME).first.click
           end
 
-          def wait_for_latest_pipeline_success
+          def wait_for_latest_pipeline_succeeded
             wait_for_latest_pipeline_status { has_text?('passed') }
           end
 
-          def wait_for_latest_pipeline_completion
+          def wait_for_latest_pipeline_completed
             wait_for_latest_pipeline_status { has_text?('passed') || has_text?('failed') }
           end
 
           def wait_for_latest_pipeline_status
+            wait_until(max_duration: 30, reload: true, sleep_interval: 5) { has_pipeline? }
+
             wait_until(reload: false, max_duration: 360) do
               within_element_by_index(:pipeline_commit_status, 0) { yield }
             end
@@ -49,6 +51,10 @@ module QA
             has_element? :pipeline_url_link
           end
 
+          def has_no_pipeline?
+            has_no_element? :pipeline_url_link
+          end
+
           def click_run_pipeline_button
             click_element :run_pipeline_button, Page::Project::Pipeline::New
           end