Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 11686ed5277..f2c342f76d0 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -99,6 +99,30 @@ FactoryBot.define do
       trait :repository_source do
         config_source { Ci::Pipeline.config_sources[:repository_source] }
       end
+
+      trait :detached_merge_request_pipeline do
+        merge_request
+
+        source { :merge_request_event }
+        project { merge_request.source_project }
+        sha { merge_request.source_branch_sha }
+        ref { merge_request.ref_path }
+      end
+
+      trait :legacy_detached_merge_request_pipeline do
+        detached_merge_request_pipeline
+
+        ref { merge_request.source_branch }
+      end
+
+      trait :merged_result_pipeline do
+        detached_merge_request_pipeline
+
+        sha { 'test-merge-sha'}
+        ref { merge_request.merge_ref_path }
+        source_sha { merge_request.source_branch_sha }
+        target_sha { merge_request.target_branch_sha }
+      end
     end
   end
 end