kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #34097 from kule/master

Browse source 
Parameterized mailers can configure delivery job
This commit is contained in:
Rafael França 2018-10-05 16:21:01 -04:00 committed by GitHub
commit 251b9d4bd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
actionmailer/CHANGELOG.md
View file

@ -1,3 +1,14 @@
* 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*

1
actionmailer/lib/action_mailer/base.rb
View file

@ -462,6 +462,7 @@ module ActionMailer
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",

3
actionmailer/lib/action_mailer/parameterized.rb
View file

@ -140,7 +140,8 @@ module ActionMailer
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

13
actionmailer/test/parameterized_test.rb
View file

@ -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