kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve #set_award! on the Note model

Browse source
This commit is contained in:
Zeger-Jan van de Weg 2016-02-19 10:10:55 +01:00
parent 11ed1cbbb7
commit aba1aa49a9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/note.rb
View file

@ -376,9 +376,6 @@ class Note < ActiveRecord::Base
def set_award!
return unless awards_supported? && contains_emoji_only?
# Responding with an emoji is not an award emoji if its on a diff comment
return if line_code
self.is_award = true
self.note = award_emoji_name
end
@ -386,7 +383,7 @@ class Note < ActiveRecord::Base
private
def awards_supported?
noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest)
(noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest)) && !for_diff_line?
end
def contains_emoji_only?

5
spec/models/note_spec.rb
View file

@ -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