diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-06-15 07:02:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 07:02:47 -0500 |
commit | 95ae033e7f6747fa7a65c74c66922c8d9fe66808 (patch) | |
tree | 9c7b501f4bc02a9c80bedbbc7e2d9653f86a1ead /actionmailer/test | |
parent | d9496c19c07d56bb200acd7312bf5d6355d515f4 (diff) | |
parent | d9bbde09fc57b29b889baadda18da943428fb06a (diff) | |
download | rails-95ae033e7f6747fa7a65c74c66922c8d9fe66808.tar.gz rails-95ae033e7f6747fa7a65c74c66922c8d9fe66808.tar.bz2 rails-95ae033e7f6747fa7a65c74c66922c8d9fe66808.zip |
Merge pull request #29457 from halogenandtoast/mm-configure_delivery_job
Allow mailers to configure their delivery job
Diffstat (limited to 'actionmailer/test')
-rw-r--r-- | actionmailer/test/message_delivery_test.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index c0683be94d..51f10b0bf1 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -95,6 +95,19 @@ class MessageDeliveryTest < ActiveSupport::TestCase end end + test "should enqueue the job with the correct delivery job" do + old_delivery_job = DelayedMailer.delivery_job + DelayedMailer.delivery_job = DummyJob + + assert_performed_with(job: DummyJob, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do + @mail.deliver_later + end + + DelayedMailer.delivery_job = old_delivery_job + end + + class DummyJob < ActionMailer::DeliveryJob; end + test "can override the queue when enqueuing mail" do assert_performed_with(job: ActionMailer::DeliveryJob, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3], queue: "another_queue") do @mail.deliver_later(queue: :another_queue) |