diff options
author | Douwe Maan <douwe@selenight.nl> | 2018-09-14 15:33:24 +0200 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-09-21 11:40:57 +0100 |
commit | 2036458e150db2840dbb1219f1cb5e079b648deb (patch) | |
tree | 90cafa462616f8439f7e8d7957571d2485fcd59e /spec/controllers/projects/notes_controller_spec.rb | |
parent | a293640404cbe7fc7ff60a04f77113ddcf990c6a (diff) | |
download | gitlab-ce-2036458e150db2840dbb1219f1cb5e079b648deb.tar.gz |
Return discussion object from NotesController#create when return_discussion param is set
Diffstat (limited to 'spec/controllers/projects/notes_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/notes_controller_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 81badaac76b..e48c9dea976 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -207,6 +207,14 @@ describe Projects::NotesController do expect(response).to have_gitlab_http_status(200) end + it 'returns discussion JSON when the return_discussion param is set' do + post :create, request_params.merge(format: :json, return_discussion: 'true') + + expect(response).to have_gitlab_http_status(200) + expect(json_response).to have_key 'discussion' + expect(json_response['discussion']['notes'][0]['note']).to eq(request_params[:note][:note]) + end + context 'when merge_request_diff_head_sha present' do before do service_params = { |