1 files changed, 26 insertions, 2 deletions
diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb
index 841ab3c73b8..f95632e7187 100644
--- a/spec/factories/milestones.rb
+++ b/spec/factories/milestones.rb
@@ -1,7 +1,14 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :milestone do
     title
-    project factory: :empty_project
+
+    transient do
+      project nil
+      group nil
+      project_id nil
+      group_id nil
+      parent nil
+    end
 
     trait :active do
       state "active"
@@ -11,6 +18,23 @@ FactoryGirl.define do
       state "closed"
     end
 
+    after(:build, :stub) do |milestone, evaluator|
+      if evaluator.group
+        milestone.group = evaluator.group
+      elsif evaluator.group_id
+        milestone.group_id = evaluator.group_id
+      elsif evaluator.project
+        milestone.project = evaluator.project
+      elsif evaluator.project_id
+        milestone.project_id = evaluator.project_id
+      elsif evaluator.parent
+        id = evaluator.parent.id
+        evaluator.parent.is_a?(Group) ? board.group_id = id : evaluator.project_id = id
+      else
+        milestone.project = create(:project)
+      end
+    end
+
     factory :active_milestone, traits: [:active]
     factory :closed_milestone, traits: [:closed]
   end