diff options
author | Sean McGivern <sean@gitlab.com> | 2019-05-06 11:59:02 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-05-06 19:48:32 +0100 |
commit | 00af4c6d6a8ea2997f57d6e872992b9fc72839d8 (patch) | |
tree | bab3f5402cb060788713c62040a483fa0cfddda1 /spec/support | |
parent | 0a7c9660e61ad7af24fd3cb93097bf283e5c9b34 (diff) | |
download | gitlab-ce-00af4c6d6a8ea2997f57d6e872992b9fc72839d8.tar.gz |
Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-api
If you can do this in the UI, you should be able to do it in the API. If
a discussion is not a single note discussion, or it is replyable, you
can reply to it.
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/shared_examples/requests/api/discussions.rb | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/spec/support/shared_examples/requests/api/discussions.rb b/spec/support/shared_examples/requests/api/discussions.rb index eff8e401bad..96f79081d26 100644 --- a/spec/support/shared_examples/requests/api/discussions.rb +++ b/spec/support/shared_examples/requests/api/discussions.rb @@ -1,4 +1,4 @@ -shared_examples 'discussions API' do |parent_type, noteable_type, id_name| +shared_examples 'discussions API' do |parent_type, noteable_type, id_name, can_reply_to_invididual_notes: false| describe "GET /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions" do it "returns an array of discussions" do get api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user) @@ -136,13 +136,25 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name| expect(response).to have_gitlab_http_status(400) end - it "returns a 400 bad request error if discussion is individual note" do - note.update_attribute(:type, nil) + context 'when the discussion is an individual note' do + before do + note.update!(type: nil) - post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\ - "discussions/#{note.discussion_id}/notes", user), params: { body: 'hi!' } + post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\ + "discussions/#{note.discussion_id}/notes", user), params: { body: 'hi!' } + end - expect(response).to have_gitlab_http_status(400) + if can_reply_to_invididual_notes + it 'creates a new discussion' do + expect(response).to have_gitlab_http_status(201) + expect(json_response['body']).to eq('hi!') + expect(json_response['type']).to eq('DiscussionNote') + end + else + it 'returns 400 bad request' do + expect(response).to have_gitlab_http_status(400) + end + end end end |