diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-15 13:44:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-15 13:44:31 +0000 |
| commit | 689786975afac6f56e66f77f01f1b1565a021930 (patch) | |
| tree | b18e415550339d58c0620596f6f78c4eaf472f63 /spec/requests/api | |
| parent | b3616e3074202d63a4ed03bbe94b14a4488c7800 (diff) | |
| parent | 9dbb0417ba683ff220ba62ecb79e6375496ad79d (diff) | |
| download | gitlab-ce-689786975afac6f56e66f77f01f1b1565a021930.tar.gz | |
Merge branch 'grapify-merge-request-api' into 'master'
Grapify the merge request API
Grapfiy the merge request API. I removed the test for checking if the source branch can be changed since this is an unused parameter. IMHO the test does not make sense.
## What are the relevant issue numbers?
Related to #22928
See merge request !7358
Diffstat (limited to 'spec/requests/api')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index bae4fa11ec2..7b3d1460c90 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -494,12 +494,6 @@ describe API::API, api: true do expect(json_response['milestone']['id']).to eq(milestone.id) end - it "returns 400 when source_branch is specified" do - put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), - source_branch: "master", target_branch: "master" - expect(response).to have_http_status(400) - end - it "returns merge_request with renamed target_branch" do put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki" expect(response).to have_http_status(200) |