diff options
author | Cristian Bica <cristian.bica@gmail.com> | 2014-09-04 08:08:06 +0300 |
---|---|---|
committer | Cristian Bica <cristian.bica@gmail.com> | 2014-09-04 08:08:06 +0300 |
commit | 15ddf60e05f5995b1aaf8d8cecfa2354005cc035 (patch) | |
tree | 9b18104849bc351858fb4461babd9fe66696de51 /actionmailer | |
parent | 1e237b4e44b7de564c7d6b331dd2f2243c4113fd (diff) | |
download | rails-15ddf60e05f5995b1aaf8d8cecfa2354005cc035.tar.gz rails-15ddf60e05f5995b1aaf8d8cecfa2354005cc035.tar.bz2 rails-15ddf60e05f5995b1aaf8d8cecfa2354005cc035.zip |
Rename remaining :in / :at to :wait / :wait_until
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 21 | ||||
-rw-r--r-- | actionmailer/test/message_delivery_test.rb | 8 |
2 files changed, 14 insertions, 15 deletions
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index 8a6a8b631f..7118f9b02c 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -39,13 +39,13 @@ module ActionMailer # and +raise_delivery_errors+, so use with caution. # # Notifier.welcome(User.first).deliver_later! - # Notifier.welcome(User.first).deliver_later!(in: 1.hour) - # Notifier.welcome(User.first).deliver_later!(at: 10.hours.from_now) + # Notifier.welcome(User.first).deliver_later!(wait: 1.hour) + # Notifier.welcome(User.first).deliver_later!(wait_until: 10.hours.from_now) # # Options: # - # * <tt>:in</tt> - Enqueue the email to be delivered with a delay - # * <tt>:at</tt> - Enqueue the email to be delivered at (after) a specific date / time + # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay + # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time def deliver_later!(options={}) enqueue_delivery :deliver_now!, options end @@ -54,13 +54,13 @@ module ActionMailer # job runs it will send the email using +deliver_now+. # # Notifier.welcome(User.first).deliver_later - # Notifier.welcome(User.first).deliver_later(in: 1.hour) - # Notifier.welcome(User.first).deliver_later(at: 10.hours.from_now) + # Notifier.welcome(User.first).deliver_later(wait: 1.hour) + # Notifier.welcome(User.first).deliver_later(wait_until: 10.hours.from_now) # # Options: # - # * <tt>:in</tt> - Enqueue the email to be delivered with a delay - # * <tt>:at</tt> - Enqueue the email to be delivered at (after) a specific date / time + # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay + # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time def deliver_later(options={}) enqueue_delivery :deliver_now, options end @@ -98,10 +98,7 @@ module ActionMailer def enqueue_delivery(delivery_method, options={}) args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args - set_options = {} - set_options[:wait_until] = options[:at] if options[:at] - set_options[:wait] = options[:in] if options[:in] - ActionMailer::DeliveryJob.set(set_options).perform_later(*args) + ActionMailer::DeliveryJob.set(options).perform_later(*args) end end end diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index db1e3c830c..9abf8b225c 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -87,15 +87,17 @@ class MessageDeliveryTest < ActiveSupport::TestCase end test 'should enqueue a delivery with a delay' do - assert_performed_with(job: ActionMailer::DeliveryJob, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3]) do - @mail.deliver_later in: 600.seconds + travel_to Time.new(2004, 11, 24, 01, 04, 44) do + assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current.to_f+600.seconds, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3]) do + @mail.deliver_later wait: 600.seconds + end end end test 'should enqueue a delivery at a specific time' do later_time = Time.now.to_f + 3600 assert_performed_with(job: ActionMailer::DeliveryJob, at: later_time, args: ['DelayedMailer', 'test_message', 'deliver_now', 1, 2, 3]) do - @mail.deliver_later at: later_time + @mail.deliver_later wait_until: later_time end end |