diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index a08fab8efa90be28e7086605ba26beaf48b8b6b3..8c6c4d29f624a5f893ce5c0af04d4b88d40f12f6 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -408,7 +408,7 @@ def try_to_merge! # Revisit after merge page re-architect is done https://gitlab.com/gitlab-org/gitlab/-/issues/300042 # To remove page refresh logic if possible wait_until_ready_to_merge - wait_until { !find_element('merge-button').text.include?('when pipeline succeeds') } # rubocop:disable Rails/NegateInclude + wait_until { !find_element('merge-button').text.include?('auto-merge') } # rubocop:disable Rails/NegateInclude click_element('merge-button') end