提交 c90c6c13 编写于 作者: L Luke Pearce

Parameterized mailers can configure delivery job

Setting parameterized_delivery_job on a mailer class will cause Parameterized::MessageDelivery to use
the specified job instead of ActionMailer::Parameterized::DeliveryJob:

    class MyMailer < ApplicationMailer
      self.parameterized_delivery_job = MyCustomDeliveryJob
      ...
    end
上级 0d4b2e4d
* Allow ActionMailer classes to configure the parameterized delivery job
Example:
```
class MyMailer < ApplicationMailer
self.parameterized_delivery_job = MyCustomDeliveryJob
...
end
```
*Luke Pearce*
* `ActionDispatch::IntegrationTest` includes `ActionMailer::TestHelper` module by default.
*Ricardo Díaz*
......
......@@ -462,6 +462,7 @@ def _protected_ivars # :nodoc:
helper ActionMailer::MailHelper
class_attribute :delivery_job, default: ::ActionMailer::DeliveryJob
class_attribute :parameterized_delivery_job, default: ::ActionMailer::Parameterized::DeliveryJob
class_attribute :default_params, default: {
mime_version: "1.0",
charset: "UTF-8",
......
......@@ -140,7 +140,8 @@ def enqueue_delivery(delivery_method, options = {})
super
else
args = @mailer_class.name, @action.to_s, delivery_method.to_s, @params, *@args
ActionMailer::Parameterized::DeliveryJob.set(options).perform_later(*args)
job = @mailer_class.parameterized_delivery_job
job.set(options).perform_later(*args)
end
end
end
......
......@@ -53,4 +53,17 @@ class ParameterizedTest < ActiveSupport::TestCase
invitation = mailer.method(:anything)
end
end
test "should enqueue a parameterized request with the correct delivery job" do
old_delivery_job = ParamsMailer.parameterized_delivery_job
ParamsMailer.parameterized_delivery_job = ParameterizedDummyJob
assert_performed_with(job: ParameterizedDummyJob, args: ["ParamsMailer", "invitation", "deliver_now", { inviter: "david@basecamp.com", invitee: "jason@basecamp.com" } ]) do
@mail.deliver_later
end
ParamsMailer.parameterized_delivery_job = old_delivery_job
end
class ParameterizedDummyJob < ActionMailer::Parameterized::DeliveryJob; end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册