1 files changed, 20 insertions, 13 deletions
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 561fbc8e247..e83a0e599a8 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -1,40 +1,47 @@
 FactoryGirl.define do
   factory :ci_empty_pipeline, class: Ci::Pipeline do
+    source :push
     ref 'master'
     sha '97de212e80737a608d939f648d959671fb0a0142'
     status 'pending'
 
-    project factory: :empty_project
+    project
 
     factory :ci_pipeline_without_jobs do
       after(:build) do |pipeline|
-        allow(pipeline).to receive(:ci_yaml_file) { YAML.dump({}) }
+        pipeline.instance_variable_set(:@ci_yaml_file, YAML.dump({}))
       end
     end
 
     factory :ci_pipeline_with_one_job do
       after(:build) do |pipeline|
         allow(pipeline).to receive(:ci_yaml_file) do
-          YAML.dump({ rspec: { script: "ls" } })
+          pipeline.instance_variable_set(:@ci_yaml_file, YAML.dump({ rspec: { script: "ls" } }))
         end
       end
     end
 
+    # Persist merge request head_pipeline_id
+    # on pipeline factories to avoid circular references
+    transient { head_pipeline_of nil }
+
+    after(:create) do |pipeline, evaluator|
+      merge_request = evaluator.head_pipeline_of
+      merge_request&.update(head_pipeline: pipeline)
+    end
+
     factory :ci_pipeline do
       transient { config nil }
 
       after(:build) do |pipeline, evaluator|
-        allow(pipeline).to receive(:ci_yaml_file) do
-          if evaluator.config
-            YAML.dump(evaluator.config)
-          else
-            File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
-          end
-        end
+        if evaluator.config
+          pipeline.instance_variable_set(:@ci_yaml_file, YAML.dump(evaluator.config))
 
-        # Populates pipeline with errors
-        #
-        pipeline.config_processor if evaluator.config
+          # Populates pipeline with errors
+          pipeline.config_processor if evaluator.config
+        else
+          pipeline.instance_variable_set(:@ci_yaml_file, File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')))
+        end
       end
 
       trait :invalid do