diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2016-11-08 09:28:52 +0100 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2016-11-15 10:31:18 +0100 |
| commit | 9dbb0417ba683ff220ba62ecb79e6375496ad79d (patch) | |
| tree | dd33b083cb53950ba121be97ec9e47c6cf7c8f68 /spec/requests | |
| parent | 36fa5d660df96c49484cd27695da1df6e361eb8f (diff) | |
| download | gitlab-ce-9dbb0417ba683ff220ba62ecb79e6375496ad79d.tar.gz | |
Grapify the merge request APIgrapify-merge-request-api
Diffstat (limited to 'spec/requests')
| -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) |