summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-07-03 14:18:27 +0100
committerPhil Hughes <me@iamphill.com>2018-07-05 15:44:55 +0100
commitb3b4272cb756519f8921a1c64865db623d430c83 (patch)
tree4b02c40025767d076a812ee241456112472a791d /spec/requests
parentc1322ab99272eb082d2181df6d12f5010525812e (diff)
downloadgitlab-ce-b3b4272cb756519f8921a1c64865db623d430c83.tar.gz
tidy up component
added api spec
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/merge_requests_spec.rb8
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..accec232bb8 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' do
+ get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}?render_html=true", user)
+
+ 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,