diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index bcce8aa0bfe893dfefadaf841572ea37e80642b9..6fd48692730edb035704ddb2e4466ea36fb59f35 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -435,9 +435,9 @@ def cherry_pick! end def revert_change! - # retry when the modal doesn't appear for large MRs as the onClick listener is initialized after the click - # https://gitlab.com/gitlab-org/gitlab/-/issues/366336 - retry_on_exception do + # reload page when the revert modal occasionally doesn't appear in ee:large-setup job + # https://gitlab.com/gitlab-org/gitlab/-/issues/386623 (transient issue) + retry_on_exception(reload: true) do click_element(:revert_button, Page::Component::CommitModal) end click_element(:submit_commit_button) diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb index f9b4a6b6bac68c0b550c7ee5849bede991fef6a8..50ef9538fb027817f8ddfd44b64cc1d4df05e5f9 100644 --- a/qa/qa/resource/merge_request.rb +++ b/qa/qa/resource/merge_request.rb @@ -186,7 +186,7 @@ def approve def fabricate_large_merge_request @project = Resource::ImportProject.fabricate_via_browser_ui! # Setting the name here, since otherwise some tests will look for an existing file in - # the proejct without ever knowing what is in it. + # the project without ever knowing what is in it. @file_name = "added_file-00000000.txt" @source_branch = "large_merge_request" visit("#{project.web_url}/-/merge_requests/1")