diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-08 17:18:44 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-08 17:18:44 +0100 |
| commit | f6a666bdc2b9b557247c34935b69f35fb518e348 (patch) | |
| tree | 7249bb9cde796fb1b0fdab63804376293a682b30 /spec | |
| parent | 86d15c1e9a824343d7698e81bd2eb4c6f2d7cc74 (diff) | |
| download | gitlab-ce-f6a666bdc2b9b557247c34935b69f35fb518e348.tar.gz | |
Add an API spec for MergeRequest#merge_status and properly document this resourcedevelop7/add-merge_status-to-merge-request-in-api
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index d7bfa17b0b1..a91a8696831 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -115,6 +115,7 @@ describe API::API, api: true do expect(response.status).to eq(200) expect(json_response['title']).to eq(merge_request.title) expect(json_response['iid']).to eq(merge_request.iid) + expect(json_response['merge_status']).to eq('can_be_merged') end it 'should return merge_request by iid' do |