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

Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification

Browse source 
Hotfix note mail with notification
This commit is contained in:
Douwe Maan 2016-01-04 12:11:13 +01:00 committed by Robert Speicher
parent ce4c38b35c
commit 12ce1cbfcf
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/emails/notes.rb
View file

@ -48,7 +48,7 @@ module Emails
yield yield
SentNotification.record(@note, recipient_id, reply_key) SentNotification.record_note(@note, recipient_id, reply_key)
end end
end end
end end

3
spec/services/notification_service_spec.rb
View file

@ -52,6 +52,9 @@ describe NotificationService, services: true do
it do it do
add_users_with_subscription(note.project, issue) add_users_with_subscription(note.project, issue)
# Ensure create SentNotification by noteable = issue 6 times, not noteable = note
expect(SentNotification).to receive(:record).with(issue, any_args).exactly(6).times
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
notification.new_note(note) notification.new_note(note)