Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 25 deletions

diff --git a/qa/qa/resource/project_milestone.rb b/qa/qa/resource/project_milestone.rb
index 11aad4ae65f..0e2d6a1bb48 100644
--- a/qa/qa/resource/project_milestone.rb
+++ b/qa/qa/resource/project_milestone.rb
@@ -3,33 +3,14 @@
 module QA
   module Resource
     class ProjectMilestone < Base
-      attr_reader :title
-      attr_accessor :description
+      attribute :title
 
       attribute :project do
         Project.fabricate!
       end
 
-      def title=(title)
-        @title = "#{title}-#{SecureRandom.hex(4)}"
-        @description = 'A milestone'
-      end
-
-      def fabricate!
-        project.visit!
-
-        Page::Project::Menu.perform do |menu|
-          menu.click_issues
-          menu.click_milestones
-        end
-
-        Page::Project::Milestone::Index.perform(&:click_new_milestone)
-
-        Page::Project::Milestone::New.perform do |milestone_new|
-          milestone_new.set_title(@title)
-          milestone_new.set_description(@description)
-          milestone_new.click_milestone_create_button
-        end
+      def initialize
+        @title = "project-milestone-#{SecureRandom.hex(4)}"
       end
 
       def api_get_path
@@ -42,8 +23,7 @@ module QA
 
       def api_post_body
         {
-          description: @description,
-          title: @title
+          title: title
         }
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
index eaa1a2a0da8..5baa0e90c47 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
@@ -32,7 +32,6 @@ module QA
 
         milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|
           milestone.project = @project
-          milestone.title = 'milestone'
         end
 
         label = Resource::Label.fabricate_via_api! do |label|