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