From 0d52b9448b9010bcf8d5f561a79b42a2e5339e27 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Thu, 20 Sep 2018 15:48:38 +0000
Subject: [PATCH] Merge branch '51657-fix-merge-mr-from-fork-spec' into
 'master'

QA: Fix failure in merge_merge_request_from_fork_spec.rb

Closes #51657

See merge request gitlab-org/gitlab-ce!21817
---
 .../components/states/ready_to_merge.vue      |  6 +++---
 qa/qa/page/merge_request/show.rb              | 20 +++++++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index a5ca7b719a1..23c3284cd21 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -255,7 +255,7 @@ export default {
             data-toggle="dropdown"
             aria-label="Select merge moment">
             <i
-              class="fa fa-chevron-down"
+              class="fa fa-chevron-down qa-merge-moment-dropdown"
               aria-hidden="true"
             ></i>
           </button>
@@ -265,7 +265,7 @@ export default {
             role="menu">
             <li>
               <a
-                class="merge_when_pipeline_succeeds"
+                class="merge_when_pipeline_succeeds qa-merge-when-pipeline-succeeds-option"
                 href="#"
                 @click.prevent="handleMergeButtonClick(true)">
                 <span class="media">
@@ -279,7 +279,7 @@ export default {
             </li>
             <li>
               <a
-                class="accept-merge-request"
+                class="accept-merge-request qa-merge-immediately-option"
                 href="#"
                 @click.prevent="handleMergeButtonClick(false, true)">
                 <span class="media">
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index c200f14f4fb..befb7c1809a 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -5,6 +5,9 @@ class Show < Page::Base
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
           element :merge_button
           element :fast_forward_message, 'Fast-forward merge without a merge commit'
+          element :merge_moment_dropdown
+          element :merge_when_pipeline_succeeds_option
+          element :merge_immediately_option
         end
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do
@@ -27,7 +30,20 @@ def fast_forward_possible?
         def has_merge_button?
           refresh
 
-          has_selector?('.accept-merge-request')
+          has_css?(element_selector_css(:merge_button))
+        end
+
+        def has_merge_options?
+          has_css?(element_selector_css(:merge_moment_dropdown))
+        end
+
+        def merge_immediately
+          if has_merge_options?
+            click_element :merge_moment_dropdown
+            click_element :merge_immediately_option
+          else
+            click_element :merge_button
+          end
         end
 
         def rebase!
@@ -59,7 +75,7 @@ def merge!
             !first(element_selector_css(:merge_button)).disabled?
           end
 
-          click_element :merge_button
+          merge_immediately
 
           wait(reload: false) do
             has_text?('The changes were merged into')
-- 
GitLab