Merge branch 'pr-9938' into 'master'

Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification Hotfix note mail with notification See merge request !2288

Merge branch 'pr-9938' into 'master'
2479af4d · Douwe Maan · a7c42451 · 12ce1cbf · 2479af4d · 2479af4d
Commit 2479af4d authored Jan 05, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

notes.rb app/mailers/emails/notes.rb +1 -1

notification_service_spec.rb spec/services/notification_service_spec.rb +3 -0

No files found.
--- 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
--- 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)