From a825dc229a9b9ecb76dc6b88d7002afe29ff5781 Mon Sep 17 00:00:00 2001
From: ddavison <ddavison@gitlab.com>
Date: Wed, 11 Jul 2018 14:14:06 -0400
Subject: move #has_milestone? to issuable sidebar; closes #48690

---
 qa/qa/page/issuable/sidebar.rb                    |  7 +++++++
 qa/qa/page/merge_request/show.rb                  |  6 ------
 qa/qa/specs/features/merge_request/create_spec.rb | 11 ++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/qa/qa/page/issuable/sidebar.rb b/qa/qa/page/issuable/sidebar.rb
index dec2ce1eab3..f207264e24f 100644
--- a/qa/qa/page/issuable/sidebar.rb
+++ b/qa/qa/page/issuable/sidebar.rb
@@ -4,6 +4,7 @@ module QA
       class Sidebar < Page::Base
         view 'app/views/shared/issuable/_sidebar.html.haml' do
           element :labels_block, ".issuable-show-labels"
+          element :milestones_block, '.block.milestone'
         end
 
         def has_label?(label)
@@ -11,6 +12,12 @@ module QA
             !!find('span', text: label)
           end
         end
+
+        def has_milestone?(milestone)
+          page.within('.block.milestone') do
+            !!find("[href*='/milestones/']", text: milestone)
+          end
+        end
       end
     end
   end
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index f3200160a78..c200f14f4fb 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -79,12 +79,6 @@ module QA
 
           click_element :squash_checkbox
         end
-
-        def has_milestone?(milestone_title)
-          page.within('.issuable-sidebar') do
-            !!find("[href*='/milestones/']", text: milestone_title, wait: 1)
-          end
-        end
       end
     end
   end
diff --git a/qa/qa/specs/features/merge_request/create_spec.rb b/qa/qa/specs/features/merge_request/create_spec.rb
index 5807e539699..36d7efb02e1 100644
--- a/qa/qa/specs/features/merge_request/create_spec.rb
+++ b/qa/qa/specs/features/merge_request/create_spec.rb
@@ -20,11 +20,12 @@ module QA
         merge_request.milestone = current_milestone
       end
 
-      Page::MergeRequest::Show.perform do |merge_request|
-        expect(page).to have_content('This is a merge request with a milestone')
-        expect(page).to have_content('Great feature with milestone')
-        expect(page).to have_content(/Opened [\w\s]+ ago/)
-        expect(merge_request).to have_milestone(current_milestone.title)
+      expect(page).to have_content('This is a merge request with a milestone')
+      expect(page).to have_content('Great feature with milestone')
+      expect(page).to have_content(/Opened [\w\s]+ ago/)
+
+      Page::Issuable::Sidebar.perform do |sidebar|
+        expect(sidebar).to have_milestone(current_milestone.title)
       end
     end
   end
-- 
cgit v1.2.1