Commit 221e88a6 authored by Walmyr Lima e Silva Filho's avatar Walmyr Lima e Silva Filho

Merge branch '37924-reload-page-if-commit-does-not-appear' into 'master'

Fix failure in squash_merge_request_spec by reloading page if commit does not appear

Closes #37924

See merge request gitlab-org/gitlab!21292
parents e6c4db7a bfd35274
......@@ -26,9 +26,11 @@ module QA
merge_request.visit!
expect(page).to have_text('to be squashed')
Page::MergeRequest::Show.perform do |merge_request_page|
merge_request_page.retry_on_exception(reload: true) do
expect(merge_request_page).to have_text('to be squashed')
end
merge_request_page.mark_to_squash
merge_request_page.merge!
......
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