summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-29 09:40:35 -0700
committerStan Hu <stanhu@gmail.com>2015-05-29 09:40:35 -0700
commit85145d1d77ed919949d59c83cccecd43789cc781 (patch)
tree46c2cfbb97f3206ef4fa4a820ef913fbc7278d8d /spec
parent467d7f6720c6b85d2b1559bb7263dde0f448402e (diff)
downloadgitlab-ce-85145d1d77ed919949d59c83cccecd43789cc781.tar.gz
Disable changing of the source branch in merge request update API
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/merge_requests_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index dcd50f73326..0ed5883914b 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -349,10 +349,10 @@ describe API::API, api: true do
expect(json_response['description']).to eq('New description')
end
- it "should return 422 when source_branch and target_branch are renamed the same" do
+ it "should return 400 when source_branch is specified" do
put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
source_branch: "master", target_branch: "master"
- expect(response.status).to eq(422)
+ expect(response.status).to eq(400)
end
it "should return merge_request with renamed target_branch" do