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

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

View File

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

View File

@ -52,6 +52,9 @@ describe NotificationService, services: true do
it do
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
notification.new_note(note)