raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-25 05:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated ActionMailer#deliver with ActionMailer#deliver_now

Browse Source 
DEPRECATION WARNING: `#deliver` is deprecated and will be removed in Rails 5. Use `#deliver_now` to deliver immediately or `#deliver_later` to deliver through Active Job.
This commit is contained in:
Matt-Yorkley
2021-01-08 13:39:09 +00:00
parent 27e83392bf
commit 3e6445c51c
33 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/controllers/admin/subscriptions_controller_spec.rb
View File

@@ -446,7 +446,7 @@ describe Admin::SubscriptionsController, type: :controller do
before do
params[:open_orders] = 'cancel'
allow(Spree::OrderMailer).to receive(:cancel_email) { mail_mock }
allow(mail_mock).to receive(:deliver)
allow(mail_mock).to receive(:deliver_now)
end
it 'renders the cancelled subscription as json, and cancels the open order' do
@@ -457,7 +457,7 @@ describe Admin::SubscriptionsController, type: :controller do
expect(subscription.reload.canceled_at).to be_within(5.seconds).of Time.zone.now
expect(order.reload.state).to eq 'canceled'
expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.zone.now
expect(mail_mock).to have_received(:deliver)
expect(mail_mock).to have_received(:deliver_now)
end
end
end
@@ -545,7 +545,7 @@ describe Admin::SubscriptionsController, type: :controller do
before do
params[:open_orders] = 'cancel'
allow(Spree::OrderMailer).to receive(:cancel_email) { mail_mock }
allow(mail_mock).to receive(:deliver)
allow(mail_mock).to receive(:deliver_now)
end
it 'renders the paused subscription as json, and cancels the open order' do
@@ -556,7 +556,7 @@ describe Admin::SubscriptionsController, type: :controller do
expect(subscription.reload.paused_at).to be_within(5.seconds).of Time.zone.now
expect(order.reload.state).to eq 'canceled'
expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.zone.now
expect(mail_mock).to have_received(:deliver)
expect(mail_mock).to have_received(:deliver_now)
end
end
end