Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 11 deletions

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)