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

1 files changed, 7 insertions, 1 deletions

diff --git a/spec/factories/iterations.rb b/spec/factories/iterations.rb
index f6be1d9d752..bd61cd469af 100644
--- a/spec/factories/iterations.rb
+++ b/spec/factories/iterations.rb
@@ -36,6 +36,12 @@ FactoryBot.define do
       end
     end
 
+    trait(:skip_project_validation) do
+      after(:stub, :build) do |iteration|
+        iteration.skip_project_validation = true
+      end
+    end
+
     after(:build, :stub) do |iteration, evaluator|
       if evaluator.group
         iteration.group = evaluator.group
@@ -49,7 +55,7 @@ FactoryBot.define do
         id = evaluator.resource_parent.id
         evaluator.resource_parent.is_a?(Group) ? evaluator.group_id = id : evaluator.project_id = id
       else
-        iteration.project = create(:project)
+        iteration.group = create(:group)
       end
     end