aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/parameterized_test.rb
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-11-30 17:33:35 -0500
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2018-12-04 11:00:34 -0500
commitf5050d998def98563f8fa4b381c09f563681f159 (patch)
tree0d32f8ccaddaf9bf7e1dd061658f58b8877f2f78 /actionmailer/test/parameterized_test.rb
parent609c58bfa6df58b88e3eadebb1f1d49354541d24 (diff)
downloadrails-f5050d998def98563f8fa4b381c09f563681f159.tar.gz
rails-f5050d998def98563f8fa4b381c09f563681f159.tar.bz2
rails-f5050d998def98563f8fa4b381c09f563681f159.zip
Add MailDeliveryJob for unified mail delivery
Add `MailDeliveryJob` for delivering both regular and parameterized mail. Deprecate using `DeliveryJob` and `Parameterized::DeliveryJob`.
Diffstat (limited to 'actionmailer/test/parameterized_test.rb')
-rw-r--r--actionmailer/test/parameterized_test.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/actionmailer/test/parameterized_test.rb b/actionmailer/test/parameterized_test.rb
index 3369808515..7dd6156744 100644
--- a/actionmailer/test/parameterized_test.rb
+++ b/actionmailer/test/parameterized_test.rb
@@ -7,7 +7,7 @@ require "mailers/params_mailer"
class ParameterizedTest < ActiveSupport::TestCase
include ActiveJob::TestHelper
- class DummyDeliveryJob < ActionMailer::DeliveryJob
+ class DummyDeliveryJob < ActionMailer::MailDeliveryJob
end
setup do
@@ -42,9 +42,10 @@ class ParameterizedTest < ActiveSupport::TestCase
"ParamsMailer",
"invitation",
"deliver_now",
- { inviter: "david@basecamp.com", invitee: "jason@basecamp.com" },
+ params: { inviter: "david@basecamp.com", invitee: "jason@basecamp.com" },
+ args: [],
]
- assert_performed_with(job: ActionMailer::DeliveryJob, args: args) do
+ assert_performed_with(job: ActionMailer::MailDeliveryJob, args: args) do
@mail.deliver_later
end
end
@@ -68,7 +69,8 @@ class ParameterizedTest < ActiveSupport::TestCase
"ParamsMailer",
"invitation",
"deliver_now",
- { inviter: "david@basecamp.com", invitee: "jason@basecamp.com" },
+ params: { inviter: "david@basecamp.com", invitee: "jason@basecamp.com" },
+ args: [],
]
with_delivery_job DummyDeliveryJob do