mirror of
https://github.com/discourse/discourse.git
synced 2025-06-02 04:08:41 +08:00
Avoid a deprecation warning by poly-filling #deliver_now and #deliver_now
This commit is contained in:
@ -5,25 +5,25 @@ describe Email::Sender do
|
||||
|
||||
it "doesn't deliver mail when mails are disabled" do
|
||||
SiteSetting.expects(:disable_emails).returns(true)
|
||||
Mail::Message.any_instance.expects(:deliver).never
|
||||
Mail::Message.any_instance.expects(:deliver_now).never
|
||||
message = Mail::Message.new(to: "hello@world.com" , body: "hello")
|
||||
Email::Sender.new(message, :hello).send
|
||||
end
|
||||
|
||||
it "doesn't deliver mail when the message is nil" do
|
||||
Mail::Message.any_instance.expects(:deliver).never
|
||||
Mail::Message.any_instance.expects(:deliver_now).never
|
||||
Email::Sender.new(nil, :hello).send
|
||||
end
|
||||
|
||||
it "doesn't deliver when the to address is nil" do
|
||||
message = Mail::Message.new(body: 'hello')
|
||||
message.expects(:deliver).never
|
||||
message.expects(:deliver_now).never
|
||||
Email::Sender.new(message, :hello).send
|
||||
end
|
||||
|
||||
it "doesn't deliver when the body is nil" do
|
||||
message = Mail::Message.new(to: 'eviltrout@test.domain')
|
||||
message.expects(:deliver).never
|
||||
message.expects(:deliver_now).never
|
||||
Email::Sender.new(message, :hello).send
|
||||
end
|
||||
|
||||
@ -53,14 +53,14 @@ describe Email::Sender do
|
||||
let(:message) do
|
||||
message = Mail::Message.new to: 'eviltrout@test.domain',
|
||||
body: '**hello**'
|
||||
message.stubs(:deliver)
|
||||
message.stubs(:deliver_now)
|
||||
message
|
||||
end
|
||||
|
||||
let(:email_sender) { Email::Sender.new(message, :valid_type) }
|
||||
|
||||
it 'calls deliver' do
|
||||
message.expects(:deliver).once
|
||||
message.expects(:deliver_now).once
|
||||
email_sender.send
|
||||
end
|
||||
|
||||
@ -131,7 +131,7 @@ describe Email::Sender do
|
||||
context 'with a user' do
|
||||
let(:message) do
|
||||
message = Mail::Message.new to: 'eviltrout@test.domain', body: 'test body'
|
||||
message.stubs(:deliver)
|
||||
message.stubs(:deliver_now)
|
||||
message
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user