Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 0 deletions

diff --git a/spec/factories/work_items.rb b/spec/factories/work_items.rb
index 6d9dcac6165..e80aa9cc008 100644
--- a/spec/factories/work_items.rb
+++ b/spec/factories/work_items.rb
@@ -9,5 +9,10 @@ FactoryBot.define do
     relative_position { RelativePositioning::START_POSITION }
     issue_type { :issue }
     association :work_item_type, :default
+
+    trait :task do
+      issue_type { :task }
+      association :work_item_type, :default, :task
+    end
   end
 end
diff --git a/spec/factories/work_items/parent_links.rb b/spec/factories/work_items/parent_links.rb
new file mode 100644
index 00000000000..886aa449a57
--- /dev/null
+++ b/spec/factories/work_items/parent_links.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :parent_link, class: 'WorkItems::ParentLink' do
+    transient do
+      work_item { nil }
+      work_item_parent { nil }
+    end
+
+    after(:build) do |link, evaluator|
+      link.work_item = evaluator.work_item
+      link.work_item_parent = evaluator.work_item_parent
+
+      unless link.work_item && link.work_item_parent
+        project = link.work_item&.project || link.work_item_parent&.project || create(:project)
+        link.work_item ||= create(:work_item, :task, project: project)
+        link.work_item_parent ||= create(:work_item, project: project)
+      end
+    end
+  end
+end