Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb
index 151d286cc29..ae98ac1bbd7 100644
--- a/spec/factories/milestones.rb
+++ b/spec/factories/milestones.rb
@@ -25,6 +25,14 @@ FactoryBot.define do
       due_date { Date.new(2000, 1, 30) }
     end
 
+    trait :on_project do
+      project
+    end
+
+    trait :on_group do
+      group
+    end
+
     after(:build, :stub) do |milestone, evaluator|
       if evaluator.group
         milestone.group = evaluator.group
@@ -44,5 +52,7 @@ FactoryBot.define do
 
     factory :active_milestone, traits: [:active]
     factory :closed_milestone, traits: [:closed]
+    factory :project_milestone, traits: [:on_project]
+    factory :group_milestone, traits: [:on_group]
   end
 end