From 404bb44ef7dfc2b0d4da6b946b8b96007aca4b56 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Oct 2019 06:06:28 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/qa/page/merge_request/show.rb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'qa') diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index ea0cbfe2ab0..6b4a8bacf24 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -129,17 +129,7 @@ module QA end def try_to_merge! - # The merge button is disabled on load - wait do - has_element?(:merge_button) - end - - # The merge button is enabled via JS - wait(reload: false) do - !find_element(:merge_button).disabled? - end - - merge_immediately + merge_immediately if ready_to_merge? end def merge! @@ -187,6 +177,18 @@ module QA click_element :edit_button end + def ready_to_merge? + # The merge button is disabled on load + wait do + has_element?(:merge_button) + end + + # The merge button is enabled via JS + wait(reload: false) do + !find_element(:merge_button).disabled? + end + end + def view_email_patches click_element :dropdown_toggle visit_link_in_element(:download_email_patches) -- cgit v1.2.1