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

[ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::DeliveryJob

Browse source
This commit is contained in:
Abdelkader Boudih 2014-08-14 23:47:38 +00:00
parent 6a2ca149fd
commit 299d1f2626
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionmailer/lib/action_mailer.rb
View file

@ -46,5 +46,5 @@ module ActionMailer
autoload :TestCase
autoload :TestHelper
autoload :MessageDelivery
autoload :DelayedDeliveryJob
autoload :DeliveryJob
end

4
actionmailer/lib/action_mailer/delayed_delivery_job.rb → actionmailer/lib/action_mailer/delivery_job.rb
View file

@ -1,11 +1,11 @@
require 'active_job'
module ActionMailer
class DelayedDeliveryJob < ActiveJob::Base
class DeliveryJob < ActiveJob::Base
queue_as :mailers
def perform(mailer, mail_method, delivery_method, *args)
mailer.constantize.send(mail_method, *args).send(delivery_method)
mailer.constantize.public_send(mail_method, *args).send(delivery_method)
end
end
end

4
actionmailer/lib/action_mailer/message_delivery.rb
View file

@ -1,3 +1,5 @@
require 'delegate'
module ActionMailer
class MessageDelivery < Delegator
def initialize(mailer, mail_method, *args)
@ -37,7 +39,7 @@ module ActionMailer
enqueue_method = :enqueue_in
args.unshift options[:in]
end
ActionMailer::DelayedDeliveryJob.send enqueue_method, *args
ActionMailer::DeliveryJob.send enqueue_method, *args
end
end
end

8
actionmailer/test/message_delivery_test.rb
View file

@ -51,21 +51,21 @@ class MessageDeliveryTest < ActiveSupport::TestCase
end
test 'should enqueue the email with :deliver delivery method' do
ret = ActionMailer::DelayedDeliveryJob.stub :enqueue, ->(*args){ args } do
ret = ActionMailer::DeliveryJob.stub :enqueue, ->(*args){ args } do
@mail.deliver_later
end
assert_equal ['DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret
end
test 'should enqueue the email with :deliver! delivery method' do
ret = ActionMailer::DelayedDeliveryJob.stub :enqueue, ->(*args){ args } do
ret = ActionMailer::DeliveryJob.stub :enqueue, ->(*args){ args } do
@mail.deliver_later!
end
assert_equal ['DelayedMailer', 'test_message', 'deliver!', 1, 2, 3], ret
end
test 'should enqueue a delivery with a delay' do
ret = ActionMailer::DelayedDeliveryJob.stub :enqueue_in, ->(*args){ args } do
ret = ActionMailer::DeliveryJob.stub :enqueue_in, ->(*args){ args } do
@mail.deliver_later in: 600
end
assert_equal [600, 'DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret
@ -73,7 +73,7 @@ class MessageDeliveryTest < ActiveSupport::TestCase
test 'should enqueue a delivery at a specific time' do
later_time = Time.now.to_i + 3600
ret = ActionMailer::DelayedDeliveryJob.stub :enqueue_at, ->(*args){ args } do
ret = ActionMailer::DeliveryJob.stub :enqueue_at, ->(*args){ args } do
@mail.deliver_later at: later_time
end
assert_equal [later_time, 'DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret