From 12ce1cbfcfff3e28cae82d327b056644457f65f6 Mon Sep 17 00:00:00 2001
From: Douwe Maan <me@douwe.me>
Date: Mon, 4 Jan 2016 12:11:13 +0100
Subject: [PATCH] Merge pull request GH-9938 from
 huacnlee/hotfix/note_mail_with_notification

Hotfix note mail with notification
---
 app/mailers/emails/notes.rb                | 2 +-
 spec/services/notification_service_spec.rb | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 65f37e92677..e1382d2da12 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -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
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index c103752198d..fc8cf425c3a 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -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)
-- 
2.30.9