Commit 5b9e801e authored by Felipe Artur's avatar Felipe Artur

Sanity check pipeline sha before saving merge request head pipeline

parent 52527be4
...@@ -119,8 +119,14 @@ module Ci ...@@ -119,8 +119,14 @@ module Ci
end end
def update_merge_requests_head_pipeline def update_merge_requests_head_pipeline
MergeRequest.where(source_branch: @pipeline.ref, source_project: @pipeline.project). merge_requests = MergeRequest.where(source_branch: @pipeline.ref, source_project: @pipeline.project)
update_all(head_pipeline_id: @pipeline.id)
merge_requests_ids =
merge_requests.select do |mr|
mr.diff_head_sha == @pipeline.sha
end.map(&:id)
MergeRequest.where(id: merge_requests_ids).update_all(head_pipeline_id: @pipeline.id)
end end
def error(message, save: false) def error(message, save: false)
......
---
title: Sanity check for pipeline sha before saving merge request pipeline id
merge_request:
author:
...@@ -58,7 +58,7 @@ describe Ci::CreatePipelineService, services: true do ...@@ -58,7 +58,7 @@ describe Ci::CreatePipelineService, services: true do
end end
context 'when merge request target project is different from source project' do context 'when merge request target project is different from source project' do
let!(:target_project) { create(:empty_project) } let!(:target_project) { create(:project) }
let!(:forked_project_link) { create(:forked_project_link, forked_to_project: project, forked_from_project: target_project) } let!(:forked_project_link) { create(:forked_project_link, forked_to_project: project, forked_from_project: target_project) }
it 'updates head pipeline for merge request' do it 'updates head pipeline for merge request' do
...@@ -70,6 +70,17 @@ describe Ci::CreatePipelineService, services: true do ...@@ -70,6 +70,17 @@ describe Ci::CreatePipelineService, services: true do
expect(merge_request.reload.head_pipeline).to eq(head_pipeline) expect(merge_request.reload.head_pipeline).to eq(head_pipeline)
end end
end end
context 'when merge request head commit sha does not match pipeline sha' do
it 'does not update merge request head pipeline' do
merge_request = create(:merge_request, source_branch: 'master', target_branch: "branch_1", source_project: project)
allow_any_instance_of(MergeRequestDiff).to receive(:head_commit).and_return(double(id: 1234))
pipeline
expect(merge_request.reload.head_pipeline).to be_nil
end
end
end end
context 'auto-cancel enabled' do context 'auto-cancel enabled' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment