Commit cb877b7e authored by Javier Castro's avatar Javier Castro

Fix notifications to handle participants and mentions on commits too

parent 707cea8d
......@@ -106,15 +106,15 @@ class NotificationService
if note.commit_id.present?
opts.merge!(commit_id: note.commit_id)
recipients = [note.commit_author]
else
opts.merge!(noteable_id: note.noteable_id)
target = note.noteable
if target.respond_to?(:participants)
recipients = target.participants
else
recipients = []
end
end
target = note.noteable
if target.respond_to?(:participants)
recipients = target.participants
else
recipients = note.mentioned_users
end
# Get users who left comment in thread
......
......@@ -48,7 +48,7 @@ describe NotificationService do
end
context 'commit note' do
let(:note) { create :note_on_commit }
let(:note) { create(:note_on_commit, note: '@mention referenced') }
before do
build_team(note.project)
......@@ -57,6 +57,7 @@ describe NotificationService do
describe :new_note do
it do
should_email(@u_watcher.id)
should_email(@u_mentioned.id)
should_not_email(note.author_id)
should_not_email(@u_participating.id)
should_not_email(@u_disabled.id)
......@@ -67,10 +68,12 @@ describe NotificationService do
create(:note_on_commit,
author: @u_participating,
project_id: note.project_id,
commit_id: note.commit_id)
commit_id: note.commit_id,
note: '@mention referenced')
should_email(@u_watcher.id)
should_email(@u_participating.id)
should_email(@u_mentioned.id)
should_not_email(note.author_id)
should_not_email(@u_disabled.id)
notification.new_note(note)
......
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