diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-06 11:02:20 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-06 11:02:20 +0000 |
commit | 33116c22fea6f035b63f6e904b619d014922d328 (patch) | |
tree | 1f2989136a1528821cef6b1f3887471752223de2 /spec/requests | |
parent | b0fa01fce3822da94aee6264829841996beb6df3 (diff) | |
parent | ed85787fcd01840bf321a7bddc493996074f984f (diff) | |
download | gitlab-ce-33116c22fea6f035b63f6e904b619d014922d328.tar.gz |
Merge branch 'ide-merge-request-info' into 'master'
Added merge request info to Web IDE sidebar
Closes #45187
See merge request gitlab-org/gitlab-ce!19860
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index eba39bb6ccc..1716d182782 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -306,6 +306,14 @@ describe API::MergeRequests do expect(json_response['changes_count']).to eq(merge_request.merge_request_diff.real_size) end + it 'exposes description and title html when render_html is true' do + get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), render_html: true + + expect(response).to have_gitlab_http_status(200) + + expect(json_response).to include('title_html', 'description_html') + end + context 'merge_request_metrics' do before do merge_request.metrics.update!(merged_by: user, |