Confirm existence of head_pipeline if pipeline success required

Pipelines are created by an async worker, so a rapid sequence of API
calls can trigger a state where the pipeline, whose existence is part of
determining if we wait for the pipeline to successfully complete before
merging, can trigger the MR to be immediately merged instead.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55127

1 files changed, 27 insertions, 0 deletions

diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 5c94a87529b..007f3517e64 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -1495,6 +1495,33 @@ describe API::MergeRequests do
       expect(json_response['merge_when_pipeline_succeeds']).to eq(true)
     end
 
+    context 'when the MR requires pipeline success' do
+      it 'returns 405 if the pipeline is missing' do
+        allow_any_instance_of(MergeRequest)
+          .to receive(:merge_when_pipeline_succeeds).and_return(true)
+        allow_any_instance_of(MergeRequest).to receive(:head_pipeline).and_return(nil)
+
+        put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
+
+        expect(response).to have_gitlab_http_status(405)
+        expect(json_response['message']).to eq('Not allowed: pipeline does not exist')
+      end
+    end
+
+    context 'when the request requires pipeline success' do
+      it 'returns 405 if the pipeline is missing' do
+        allow_any_instance_of(MergeRequest)
+          .to receive(:merge_when_pipeline_succeeds).and_return(true)
+        allow_any_instance_of(MergeRequest).to receive(:head_pipeline).and_return(nil)
+
+        put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user),
+              params: { merge_when_pipeline_succeeds: true }
+
+        expect(response).to have_gitlab_http_status(405)
+        expect(json_response['message']).to eq('Not allowed: pipeline does not exist')
+      end
+    end
+
     it "returns 404 for an invalid merge request IID" do
       put api("/projects/#{project.id}/merge_requests/12345/merge", user)