Commit 16b15720 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-shl-fix-pipelines-for-merged-results-spec' into 'master'

Retry until 'The changes were merged' appears

Closes #33404

See merge request gitlab-org/gitlab!18113
parents f10ee617 d13aef07
......@@ -70,7 +70,11 @@ module QA
show.merge_immediately
end
expect(page).to have_content('The changes were merged')
merged = Support::Retrier.retry_until(reload_page: page) do
page.has_content?('The changes were merged')
end
expect(merged).to be_truthy, "Expected content 'The changes were merged' but it did not appear."
end
it 'merges via a merge train' do
......
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