diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-11 16:42:47 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-07-11 11:18:51 -0700 |
commit | a801e16dbfc3686ff1e20c6adab29e579265c5fb (patch) | |
tree | 66f6adae8908ad37eda910dae36f500fd021e157 /spec | |
parent | ebcc5989a817fbb9dd4699690e867d19c8642710 (diff) | |
download | gitlab-ce-a801e16dbfc3686ff1e20c6adab29e579265c5fb.tar.gz |
Merge branch 'sh-add-mr-simple-mode' into 'master'sh-add-simple-mode-mr-api-9-4-stable
Add a simple mode to merge request API
Closes #34920
See merge request !12766
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 360a82196a8..9098ae6bcda 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -69,6 +69,22 @@ describe API::MergeRequests do expect(json_response.first['merge_commit_sha']).to eq(merge_request_merged.merge_commit_sha) end + it "returns an array of all merge_requests using simple mode" do + get api("/projects/#{project.id}/merge_requests?view=simple", user) + + expect(response).to have_http_status(200) + expect(response).to include_pagination_headers + expect(json_response.last.keys).to match_array(%w(id iid title web_url created_at description project_id state updated_at)) + expect(json_response).to be_an Array + expect(json_response.length).to eq(3) + expect(json_response.last['iid']).to eq(merge_request.iid) + expect(json_response.last['title']).to eq(merge_request.title) + expect(json_response.last).to have_key('web_url') + expect(json_response.first['iid']).to eq(merge_request_merged.iid) + expect(json_response.first['title']).to eq(merge_request_merged.title) + expect(json_response.first).to have_key('web_url') + end + it "returns an array of all merge_requests" do get api("/projects/#{project.id}/merge_requests?state", user) |