Commit 56bf829c753662a880805b278cae87d9cd1aa3ac
1 parent
e6cdfb60
Exists in
master
and in
4 other branches
API: fix after review
Showing
1 changed file
with
6 additions
and
6 deletions
Show diff stats
spec/requests/api/merge_requests_spec.rb
| @@ -11,14 +11,14 @@ describe Gitlab::API do | @@ -11,14 +11,14 @@ describe Gitlab::API do | ||
| 11 | describe "GET /projects/:id/merge_requests" do | 11 | describe "GET /projects/:id/merge_requests" do |
| 12 | context "when unauthenticated" do | 12 | context "when unauthenticated" do |
| 13 | it "should return authentication error" do | 13 | it "should return authentication error" do |
| 14 | - get api("/projects/#{project.id}/merge_requests") | 14 | + get api("/projects/#{project.code}/merge_requests") |
| 15 | response.status.should == 401 | 15 | response.status.should == 401 |
| 16 | end | 16 | end |
| 17 | end | 17 | end |
| 18 | 18 | ||
| 19 | context "when authenticated" do | 19 | context "when authenticated" do |
| 20 | it "should return an array of merge_requests" do | 20 | it "should return an array of merge_requests" do |
| 21 | - get api("/projects/#{project.id}/merge_requests", user) | 21 | + get api("/projects/#{project.code}/merge_requests", user) |
| 22 | response.status.should == 200 | 22 | response.status.should == 200 |
| 23 | json_response.should be_an Array | 23 | json_response.should be_an Array |
| 24 | json_response.first['title'].should == merge_request.title | 24 | json_response.first['title'].should == merge_request.title |
| @@ -28,7 +28,7 @@ describe Gitlab::API do | @@ -28,7 +28,7 @@ describe Gitlab::API do | ||
| 28 | 28 | ||
| 29 | describe "GET /projects/:id/merge_request/:merge_request_id" do | 29 | describe "GET /projects/:id/merge_request/:merge_request_id" do |
| 30 | it "should return merge_request" do | 30 | it "should return merge_request" do |
| 31 | - get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user) | 31 | + get api("/projects/#{project.code}/merge_request/#{merge_request.id}", user) |
| 32 | response.status.should == 200 | 32 | response.status.should == 200 |
| 33 | json_response['title'].should == merge_request.title | 33 | json_response['title'].should == merge_request.title |
| 34 | end | 34 | end |
| @@ -36,7 +36,7 @@ describe Gitlab::API do | @@ -36,7 +36,7 @@ describe Gitlab::API do | ||
| 36 | 36 | ||
| 37 | describe "POST /projects/:id/merge_requests" do | 37 | describe "POST /projects/:id/merge_requests" do |
| 38 | it "should return merge_request" do | 38 | it "should return merge_request" do |
| 39 | - post api("/projects/#{project.id}/merge_requests", user), | 39 | + post api("/projects/#{project.code}/merge_requests", user), |
| 40 | title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user | 40 | title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user |
| 41 | response.status.should == 201 | 41 | response.status.should == 201 |
| 42 | json_response['title'].should == 'Test merge_request' | 42 | json_response['title'].should == 'Test merge_request' |
| @@ -45,7 +45,7 @@ describe Gitlab::API do | @@ -45,7 +45,7 @@ describe Gitlab::API do | ||
| 45 | 45 | ||
| 46 | describe "PUT /projects/:id/merge_request/:merge_request_id" do | 46 | describe "PUT /projects/:id/merge_request/:merge_request_id" do |
| 47 | it "should return merge_request" do | 47 | it "should return merge_request" do |
| 48 | - put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title" | 48 | + put api("/projects/#{project.code}/merge_request/#{merge_request.id}", user), title: "New title" |
| 49 | response.status.should == 200 | 49 | response.status.should == 200 |
| 50 | json_response['title'].should == 'New title' | 50 | json_response['title'].should == 'New title' |
| 51 | end | 51 | end |
| @@ -53,7 +53,7 @@ describe Gitlab::API do | @@ -53,7 +53,7 @@ describe Gitlab::API do | ||
| 53 | 53 | ||
| 54 | describe "POST /projects/:id/merge_request/:merge_request_id/comments" do | 54 | describe "POST /projects/:id/merge_request/:merge_request_id/comments" do |
| 55 | it "should return comment" do | 55 | it "should return comment" do |
| 56 | - post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment" | 56 | + post api("/projects/#{project.code}/merge_request/#{merge_request.id}/comments", user), note: "My comment" |
| 57 | response.status.should == 201 | 57 | response.status.should == 201 |
| 58 | json_response['note'].should == 'My comment' | 58 | json_response['note'].should == 'My comment' |
| 59 | end | 59 | end |