diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-01-04 13:28:07 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-04 13:28:07 -0500 |
| commit | 940d137bb527105f9dfde3ebcb0906d3aebec68a (patch) | |
| tree | da105bc588a1538fcd503ea667e8db55da23c206 | |
| parent | 9c8ce4b6b5d67a76827a7589ab1de207209b7fd6 (diff) | |
| parent | 25974203b8aa7fcc3fe3b8d283cfbe99e5612908 (diff) | |
| download | gitlab-ce-940d137bb527105f9dfde3ebcb0906d3aebec68a.tar.gz | |
Merge branch '8-3-stable' of github.com:gitlabhq/gitlabhq into 8-3-stable
| -rw-r--r-- | app/mailers/emails/notes.rb | 2 | ||||
| -rw-r--r-- | spec/services/notification_service_spec.rb | 3 |
2 files changed, 4 insertions, 1 deletions
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 d7a898e85ff..e0af2bbe3c0 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) |