Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 37 insertions, 12 deletions

diff --git a/qa/qa/page/project/milestone/index.rb b/qa/qa/page/project/milestone/index.rb
index 6895c44f72f..d25a3389ae8 100644
--- a/qa/qa/page/project/milestone/index.rb
+++ b/qa/qa/page/project/milestone/index.rb
@@ -4,13 +4,25 @@ module QA
   module Page
     module Project
       module Milestone
-        class Index < Page::Base
+        class Index < Page::Milestone::Index
           view 'app/views/projects/milestones/index.html.haml' do
-            element :new_project_milestone
+            element :new_project_milestone_link
           end
 
-          def click_new_milestone
-            click_element :new_project_milestone
+          view 'app/views/shared/milestones/_milestone.html.haml' do
+            element :milestone_link
+          end
+
+          def click_new_milestone_link
+            click_element :new_project_milestone_link
+          end
+
+          def has_milestone?(milestone)
+            has_element? :milestone_link, milestone_title: milestone.title
+          end
+
+          def click_milestone(milestone)
+            click_element :milestone_link, milestone_title: milestone.title
           end
         end
       end
diff --git a/qa/qa/page/project/milestone/new.rb b/qa/qa/page/project/milestone/new.rb
index 751fb141684..98f3a0ef4ab 100644
--- a/qa/qa/page/project/milestone/new.rb
+++ b/qa/qa/page/project/milestone/new.rb
@@ -4,23 +4,36 @@ module QA
   module Page
     module Project
       module Milestone
-        class New < Page::Base
+        class New < Page::Milestone::New
           view 'app/views/projects/milestones/_form.html.haml' do
-            element :milestone_create_button
-            element :milestone_title
-            element :milestone_description
+            element :create_milestone_button
+            element :milestone_description_field
+            element :milestone_title_field
+          end
+
+          view 'app/views/shared/milestones/_form_dates.html.haml' do
+            element :due_date_field
+            element :start_date_field
+          end
+
+          def click_create_milestone_button
+            click_element :create_milestone_button
           end
 
           def set_title(title)
-            fill_element :milestone_title, title
+            fill_element :milestone_title_field, title
           end
 
           def set_description(description)
-            fill_element :milestone_description, description
+            fill_element :milestone_description_field, description
+          end
+
+          def set_due_date(due_date)
+            fill_element :due_date_field, due_date.to_s + "\n"
           end
 
-          def click_milestone_create_button
-            click_element :milestone_create_button
+          def set_start_date(start_date)
+            fill_element :start_date_field, start_date.to_s + "\n"
           end
         end
       end