diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-02-18 12:26:10 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-02-19 12:04:38 +0300 |
commit | 11ed1cbbb7b777a4883af6ec5b79b958881fab67 (patch) | |
tree | 306b06789d8b8b9a4a4e7b3129674c494f9ecc43 /spec/models/note_spec.rb | |
parent | a33b63b7d4f22a467763f6191af5696531d203e6 (diff) |
Emoji reponses on diffs aren't award emoji
Diffstat (limited to 'spec/models/note_spec.rb')
-rw-r--r-- | spec/models/note_spec.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 9182b42661d..7a293490c51 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -203,11 +203,16 @@ describe Note, models: true do end describe "set_award!" do - let(:issue) { create :issue } + let(:merge_request) { create :merge_request } it "converts aliases to actual name" do - note = create :note, note: ":+1:", noteable: issue + note = create(:note, note: ":+1:", noteable: merge_request) expect(note.reload.note).to eq("thumbsup") end + + it "is not an award emoji when comment is on a diff" do + note = create(:note, note: ":blowfish:", noteable: merge_request, line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2") + expect(note.reload.note).to eq(":blowfish:") + end end end |