summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 14:46:54 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 14:46:54 -0800
commitfc13ea713751d853693396aa77b51bbaa71c015b (patch)
treefed1ae727be1e6d8a219b8208d167c5365fce603 /spec/requests
parent61d07eabfc7b9ad44b0d50f73003cabe28a04b42 (diff)
parentb60d06eb2c91a61b91a214dac0f0f526b146f8d7 (diff)
downloadgitlab-ce-fc13ea713751d853693396aa77b51bbaa71c015b.tar.gz
Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint
Added a way to retrieve MR files
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/merge_requests_spec.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 5ba3a330991..5795082f5cb 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -114,6 +114,19 @@ describe API::API, api: true do
end
end
+ describe 'GET /projects/:id/merge_request/:merge_request_id/changes' do
+ it 'should return the change information of the merge_request' do
+ get api("/projects/#{project.id}/merge_request/#{merge_request.id}/changes", user)
+ expect(response.status).to eq 200
+ expect(json_response['changes'].size).to eq(merge_request.diffs.size)
+ end
+
+ it 'returns a 404 when merge_request_id not found' do
+ get api("/projects/#{project.id}/merge_request/999/changes", user)
+ expect(response.status).to eq(404)
+ end
+ end
+
describe "POST /projects/:id/merge_requests" do
context 'between branches projects' do
it "should return merge_request" do