kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-typo-in-spec-requests-api-merge_requests_spec.rb' into 'master' 

Fix a URL typo in the MR API specs

See merge request gitlab-org/gitlab-ce!24236
This commit is contained in:
Robert Speicher 2019-01-08 18:15:38 +00:00
parent cdd51c8580 d739e8b985
commit e4b31f5415
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/requests/api/merge_requests_spec.rb
View File

@ -1189,13 +1189,13 @@ describe API::MergeRequests do
end
it 'returns 404 if the merge request is not found' do
post api("/projects/#{project.id}/merge_requests/123/merge_when_pipeline_succeeds", user)
post api("/projects/#{project.id}/merge_requests/123/cancel_merge_when_pipeline_succeeds", user)
expect(response).to have_gitlab_http_status(404)
end
it 'returns 404 if the merge request id is used instead of iid' do
post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge_when_pipeline_succeeds", user)
post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/cancel_merge_when_pipeline_succeeds", user)
expect(response).to have_gitlab_http_status(404)
end