diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-03-03 10:48:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 10:48:41 +0000 |
| commit | c9bc4de19850ce3e66d0bf1f9ef70468c0366670 (patch) | |
| tree | d6610b4eb96c4c69bb69a486c43d270ce1b46b82 /actionmailer | |
| parent | e1a72fef7de9a5c0871b0ef1a4acb9483d2bf1f3 (diff) | |
| parent | 75924c4517c8f87712d3f59c11f10152ed57b9d8 (diff) | |
| download | rails-c9bc4de19850ce3e66d0bf1f9ef70468c0366670.tar.gz rails-c9bc4de19850ce3e66d0bf1f9ef70468c0366670.tar.bz2 rails-c9bc4de19850ce3e66d0bf1f9ef70468c0366670.zip | |
Merge pull request #28204 from rails/deprecate-implicit-coercion-of-durations
Deprecate implicit coercion of `ActiveSupport::Duration`
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/message_delivery_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index a79d77e1e5..f4c4f43bdc 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -76,7 +76,7 @@ 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.to_f + 600.seconds, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do + assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current.to_f + 600, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do @mail.deliver_later wait: 600.seconds end end |