diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-03-15 15:46:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 15:46:55 +0000 |
| commit | 8efbfba248728c3836aaa64efc1690322f3ddad1 (patch) | |
| tree | 761ed05323eb2c0e4c9e918bfed2b03611387ce2 /actionmailer | |
| parent | 401d3ad56c08f2d03f49b096e69be43e33e16838 (diff) | |
| parent | de5eb9ed9869fad99af0296267594e5ae6dff74b (diff) | |
| download | rails-8efbfba248728c3836aaa64efc1690322f3ddad1.tar.gz rails-8efbfba248728c3836aaa64efc1690322f3ddad1.tar.bz2 rails-8efbfba248728c3836aaa64efc1690322f3ddad1.zip | |
Merge pull request #28425 from rails/remove-duration-deprecation
Remove implicit coercion deprecation of durations
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/message_delivery_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index e3d15816d4..c0683be94d 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -76,8 +76,8 @@ class MessageDeliveryTest < ActiveSupport::TestCase test "should enqueue a delivery with a delay" do travel_to Time.new(2004, 11, 24, 01, 04, 44) do - assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current + 600.seconds, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do - @mail.deliver_later wait: 600.seconds + assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current + 10.minutes, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do + @mail.deliver_later wait: 10.minutes end end end |