Commit aba1aa49 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Improve #set_award! on the Note model

parent 11ed1cbb
...@@ -376,9 +376,6 @@ class Note < ActiveRecord::Base ...@@ -376,9 +376,6 @@ class Note < ActiveRecord::Base
def set_award! def set_award!
return unless awards_supported? && contains_emoji_only? 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.is_award = true
self.note = award_emoji_name self.note = award_emoji_name
end end
...@@ -386,7 +383,7 @@ class Note < ActiveRecord::Base ...@@ -386,7 +383,7 @@ class Note < ActiveRecord::Base
private private
def awards_supported? def awards_supported?
noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest) (noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest)) && !for_diff_line?
end end
def contains_emoji_only? def contains_emoji_only?
......
...@@ -212,7 +212,10 @@ describe Note, models: true do ...@@ -212,7 +212,10 @@ describe Note, models: true do
it "is not an award emoji when comment is on a diff" 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") 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 end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment