Commit 2d2b2da45a586bdf29e115dcb4b4f66f9a1feed0
1 parent
ab032256
Exists in
spb-stable
and in
2 other branches
More tests for merge api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
15 additions
and
0 deletions
Show diff stats
spec/requests/api/merge_requests_spec.rb
| @@ -196,6 +196,21 @@ describe API::API, api: true do | @@ -196,6 +196,21 @@ describe API::API, api: true do | ||
| 196 | response.status.should == 405 | 196 | response.status.should == 405 |
| 197 | json_response['message'].should == 'Branch cannot be merged' | 197 | json_response['message'].should == 'Branch cannot be merged' |
| 198 | end | 198 | end |
| 199 | + | ||
| 200 | + it "should return 405 if merge_request is not open" do | ||
| 201 | + merge_request.close | ||
| 202 | + put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user) | ||
| 203 | + response.status.should == 405 | ||
| 204 | + json_response['message'].should == 'Method Not Allowed' | ||
| 205 | + end | ||
| 206 | + | ||
| 207 | + it "should return 401 if user has no permissions to merge" do | ||
| 208 | + user2 = create(:user) | ||
| 209 | + project.team << [user2, :reporter] | ||
| 210 | + put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user2) | ||
| 211 | + response.status.should == 401 | ||
| 212 | + json_response['message'].should == '401 Unauthorized' | ||
| 213 | + end | ||
| 199 | end | 214 | end |
| 200 | 215 | ||
| 201 | describe "PUT /projects/:id/merge_request/:merge_request_id" do | 216 | describe "PUT /projects/:id/merge_request/:merge_request_id" do |