Commit 968fa327 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'ml-update-mwps-e2e-test' into 'master'

Update MWPS test to avoid transient failures

See merge request gitlab-org/gitlab!57945
parents b44ecedd 4eaf30f0
...@@ -69,16 +69,17 @@ module QA ...@@ -69,16 +69,17 @@ module QA
Page::MergeRequest::Show.perform do |mr| Page::MergeRequest::Show.perform do |mr|
mr.merge_when_pipeline_succeeds! mr.merge_when_pipeline_succeeds!
expect(mr.merge_request_status).to match(/to be merged automatically when the pipeline succeeds/)
Support::Waiter.wait_until(sleep_interval: 5) do Support::Waiter.wait_until(sleep_interval: 5) do
merge_request = merge_request.reload! merge_request = merge_request.reload!
merge_request.state == 'merged' merge_request.state == 'merged'
end end
aggregate_failures do
expect(merge_request.merge_when_pipeline_succeeds).to be_truthy
expect(mr.merged?).to be_truthy, "Expected content 'The changes were merged' but it did not appear." expect(mr.merged?).to be_truthy, "Expected content 'The changes were merged' but it did not appear."
end end
end end
end end
end end
end
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