summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-02-19 10:10:55 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-02-19 10:10:55 +0100
commitaba1aa49a986230d697106117b5e9b0efa97467c (patch)
tree6c09516b48673f276ffe54eeaf995694690da59c /spec
parent11ed1cbbb7b777a4883af6ec5b79b958881fab67 (diff)
downloadgitlab-ce-aba1aa49a986230d697106117b5e9b0efa97467c.tar.gz
Improve #set_award! on the Note model12792-emoji-as-text-diff-comment
Diffstat (limited to 'spec')
-rw-r--r--spec/models/note_spec.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 7a293490c51..e6da3724d33 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -212,7 +212,10 @@ describe Note, models: true do
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:")
+ note = note.reload
+
+ expect(note.note).to eq(":blowfish:")
+ expect(note.is_award?).to be_falsy
end
end
end