mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-18 15:48:22 +00:00
Add coverage for missing status scenario in NotificationMailer (#32256)
This commit is contained in:
parent
e4e07b1c34
commit
ebdeac0731
|
@ -86,7 +86,7 @@ class NotificationMailer < ApplicationMailer
|
|||
end
|
||||
|
||||
def thread_by_conversation!
|
||||
return if @status.conversation.nil?
|
||||
return if @status&.conversation.nil?
|
||||
|
||||
conversation_message_id = "<conversation-#{@status.conversation.id}.#{@status.conversation.created_at.to_date}@#{Rails.configuration.x.local_domain}>"
|
||||
|
||||
|
|
|
@ -14,6 +14,17 @@ RSpec.describe NotificationMailer do
|
|||
end
|
||||
end
|
||||
|
||||
shared_examples 'delivery without status' do
|
||||
context 'when notification target_status is missing' do
|
||||
before { allow(notification).to receive(:target_status).and_return(nil) }
|
||||
|
||||
it 'does not deliver mail' do
|
||||
emails = capture_emails { mail.deliver_now }
|
||||
expect(emails).to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
let(:receiver) { Fabricate(:user, account_attributes: { username: 'alice' }) }
|
||||
let(:sender) { Fabricate(:account, username: 'bob') }
|
||||
let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') }
|
||||
|
@ -37,6 +48,7 @@ RSpec.describe NotificationMailer do
|
|||
end
|
||||
|
||||
include_examples 'delivery to non functional user'
|
||||
include_examples 'delivery without status'
|
||||
end
|
||||
|
||||
describe 'follow' do
|
||||
|
@ -75,6 +87,7 @@ RSpec.describe NotificationMailer do
|
|||
end
|
||||
|
||||
include_examples 'delivery to non functional user'
|
||||
include_examples 'delivery without status'
|
||||
end
|
||||
|
||||
describe 'reblog' do
|
||||
|
@ -95,6 +108,7 @@ RSpec.describe NotificationMailer do
|
|||
end
|
||||
|
||||
include_examples 'delivery to non functional user'
|
||||
include_examples 'delivery without status'
|
||||
end
|
||||
|
||||
describe 'follow_request' do
|
||||
|
|
Loading…
Reference in a new issue