1 files changed, 6 insertions, 0 deletions
diff --git a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
index 769b3193275..3ef5135e6a3 100644
--- a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
@@ -82,6 +82,10 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do
                              sha: merge_request_head, status: 'success')
       end
 
+      before do
+        mr_merge_if_green_enabled.update(head_pipeline: triggering_pipeline)
+      end
+
       it "merges all merge requests with merge when the pipeline succeeds enabled" do
         expect(MergeWorker).to receive(:perform_async)
         service.trigger(triggering_pipeline)
@@ -124,6 +128,8 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do
                              sha: mr_conflict.diff_head_sha, status: 'success')
       end
 
+      before { mr_conflict.update(head_pipeline: conflict_pipeline) }
+
       it 'does not merge the merge request' do
         expect(MergeWorker).not_to receive(:perform_async)