Commit 940d137b authored by Robert Speicher's avatar Robert Speicher

Merge branch '8-3-stable' of github.com:gitlabhq/gitlabhq into 8-3-stable

parents 9c8ce4b6 25974203
...@@ -48,7 +48,7 @@ module Emails ...@@ -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
...@@ -52,6 +52,9 @@ describe NotificationService, services: true do ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment