summaryrefslogtreecommitdiff
path: root/spec/requests/api/notes_spec.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-01 11:15:51 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-01 11:15:51 +0000
commit523fb730c27976900edf040b5ea03e45d29ea965 (patch)
tree829b6928f84ea84c84d922bbcbbf3b00072f6876 /spec/requests/api/notes_spec.rb
parent11dd2348c410949c98adfc10cdcf5be787742179 (diff)
parent9f949d4e24c5939b5ea4071c3e86c514b4d82970 (diff)
downloadgitlab-ce-523fb730c27976900edf040b5ea03e45d29ea965.tar.gz
Merge branch '25437-just-emoji' into 'master'
#25437 Allow posting of just an emoji in comment; add /award slash command Closes #25437 See merge request !9382
Diffstat (limited to 'spec/requests/api/notes_spec.rb')
-rw-r--r--spec/requests/api/notes_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 9d3c821b692..347f8f6fa3b 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -225,11 +225,11 @@ describe API::Notes, api: true do
context 'when the user is posting an award emoji on an issue created by someone else' do
let(:issue2) { create(:issue, project: project) }
- it 'returns an award emoji' do
+ it 'creates a new issue note' do
post api("/projects/#{project.id}/issues/#{issue2.id}/notes", user), body: ':+1:'
expect(response).to have_http_status(201)
- expect(json_response['awardable_id']).to eq issue2.id
+ expect(json_response['body']).to eq(':+1:')
end
end