diff options
Diffstat (limited to 'qa/qa/page/merge_request/show.rb')
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index e10db796f8e..e0ec5d50bc5 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -118,7 +118,7 @@ module QA end view 'app/views/projects/merge_requests/_mr_title.html.haml' do - element :edit_button + element :edit_title_button element :title_content, required: true end @@ -201,13 +201,6 @@ module QA def click_diffs_tab # Do not wait for spinner due to https://gitlab.com/gitlab-org/gitlab/-/issues/398584 click_element(:diffs_tab, skip_finished_loading_check: true) - - # If the diff isn't available when we navigate to the Changes tab - # we must reload the page. https://gitlab.com/gitlab-org/gitlab/-/issues/398557 - wait_until(reload: true, skip_finished_loading_check_on_refresh: true) do - QA::Runtime::Logger.debug('Ensuring that diff has loaded async') - has_element?(:file_tree_button, skip_finished_loading_check: true, wait: 5) - end end def click_pipeline_link @@ -218,7 +211,7 @@ module QA # Click by JS is needed to bypass the Moved MR actions popover # Change back to regular click_element when moved_mr_sidebar FF is removed # Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/385460 - click_by_javascript(find_element(:edit_button)) + click_by_javascript(find_element(:edit_title_button, skip_finished_loading_check: true)) end def fast_forward_not_possible? @@ -474,10 +467,6 @@ module QA click_element(:submit_commit_button) end - def cancel_auto_merge! - click_element(:cancel_auto_merge_button) - end - def mr_widget_text find_element(:mr_widget_content).text end |