aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/message_delivery_test.rb
diff options
context:
space:
mode:
authorCristian Bica <cristian.bica@gmail.com>2014-09-04 08:08:06 +0300
committerCristian Bica <cristian.bica@gmail.com>2014-09-04 08:08:06 +0300
commit15ddf60e05f5995b1aaf8d8cecfa2354005cc035 (patch)
tree9b18104849bc351858fb4461babd9fe66696de51 /actionmailer/test/message_delivery_test.rb
parent1e237b4e44b7de564c7d6b331dd2f2243c4113fd (diff)
downloadrails-15ddf60e05f5995b1aaf8d8cecfa2354005cc035.tar.gz
rails-15ddf60e05f5995b1aaf8d8cecfa2354005cc035.tar.bz2
rails-15ddf60e05f5995b1aaf8d8cecfa2354005cc035.zip
Rename remaining :in / :at to :wait / :wait_until
Diffstat (limited to 'actionmailer/test/message_delivery_test.rb')
-rw-r--r--actionmailer/test/message_delivery_test.rb8
1 files changed, 5 insertions, 3 deletions
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