Commit 6525bb1f authored by Dan Davison's avatar Dan Davison

Merge branch 'qe-update-pipeline-status-checks' into 'master'

Refine Has pipeline status check in E2E specs

See merge request gitlab-org/gitlab!65574
parents 199c5026 1b23d2dd
...@@ -40,7 +40,7 @@ module QA ...@@ -40,7 +40,7 @@ module QA
Page::MergeRequest::Show.perform do |mr_widget| Page::MergeRequest::Show.perform do |mr_widget|
Support::Retrier.retry_until(max_attempts: 5, sleep_interval: 5) do Support::Retrier.retry_until(max_attempts: 5, sleep_interval: 5) do
mr_widget.has_pipeline_status?(/Pipeline #\d+ passed/) mr_widget.has_pipeline_status?('passed')
end end
expect(mr_widget).to have_content('Test coverage 66.67%') expect(mr_widget).to have_content('Test coverage 66.67%')
end end
......
...@@ -77,11 +77,7 @@ module QA ...@@ -77,11 +77,7 @@ module QA
it 'creates a multi-project pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/560' do it 'creates a multi-project pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/560' do
Page::MergeRequest::Show.perform do |show| Page::MergeRequest::Show.perform do |show|
pipeline_passed = show.retry_until(reload: true, max_attempts: 20, sleep_interval: 6) do expect(show.has_pipeline_status?('passed')).to be_truthy
show.has_content?(/Pipeline #\d+ passed/)
end
expect(pipeline_passed).to be_truthy, "The pipeline did not pass."
show.click_pipeline_link show.click_pipeline_link
end end
......
...@@ -47,8 +47,8 @@ module QA ...@@ -47,8 +47,8 @@ module QA
@merge_request.visit! @merge_request.visit!
Page::MergeRequest::Show.perform do |merge_request| Page::MergeRequest::Show.perform do |merge_request|
# Give time for the runner on Staging to complete pipeline # Give time for the runner on Staging to complete pipeline
Support::Retrier.retry_until(max_attempts: 5, sleep_interval: 5, reload_page: merge_request) do Support::Retrier.retry_until(max_attempts: 5, sleep_interval: 5) do
merge_request.has_pipeline_status?(/Pipeline #\d+ passed/) merge_request.has_pipeline_status?('passed')
end end
merge_request.merge! merge_request.merge!
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment