Skip to content
Snippets Groups Projects
Commit 12ce1cbf authored by Douwe Maan's avatar Douwe Maan Committed by Robert Speicher
Browse files

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

Hotfix note mail with notification
parent ce4c38b3
No related branches found
No related tags found
1 merge request!2288Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
Pipeline #
Loading
@@ -48,7 +48,7 @@ module Emails
Loading
@@ -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
Loading
@@ -52,6 +52,9 @@ describe NotificationService, services: true do
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment