diff options
| author | George Claghorn <george@basecamp.com> | 2018-10-18 17:39:04 -0400 |
|---|---|---|
| committer | George Claghorn <george@basecamp.com> | 2018-10-18 17:39:04 -0400 |
| commit | f33ccec86c02205cc82dd14dea24a5ad3f27f502 (patch) | |
| tree | 8b61db32444ab456e1fc9913ccc80e454e2ef123 /test/unit | |
| parent | 4411095290f24ccb2e263c9534acfd19d081120f (diff) | |
| parent | cf8d76fdb42ab33c778b1787fb2ebe06481e2e3f (diff) | |
| download | rails-f33ccec86c02205cc82dd14dea24a5ad3f27f502.tar.gz rails-f33ccec86c02205cc82dd14dea24a5ad3f27f502.tar.bz2 rails-f33ccec86c02205cc82dd14dea24a5ad3f27f502.zip | |
Merge branch 'master' into ingresses
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/inbound_email/incineration_test.rb | 6 | ||||
| -rw-r--r-- | test/unit/mailbox/routing_test.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/unit/inbound_email/incineration_test.rb b/test/unit/inbound_email/incineration_test.rb index 72378df05a..a3267afac9 100644 --- a/test/unit/inbound_email/incineration_test.rb +++ b/test/unit/inbound_email/incineration_test.rb @@ -4,7 +4,7 @@ class ActionMailbox::InboundEmail::IncinerationTest < ActiveSupport::TestCase test "incinerating 30 days after delivery" do freeze_time - assert_enqueued_with job: ActionMailbox::InboundEmail::IncinerationJob, at: 30.days.from_now do + assert_enqueued_with job: ActionMailbox::IncinerationJob, at: 30.days.from_now do create_inbound_email_from_fixture("welcome.eml").delivered! end end @@ -12,7 +12,7 @@ class ActionMailbox::InboundEmail::IncinerationTest < ActiveSupport::TestCase test "incinerating 30 days after bounce" do freeze_time - assert_enqueued_with job: ActionMailbox::InboundEmail::IncinerationJob, at: 30.days.from_now do + assert_enqueued_with job: ActionMailbox::IncinerationJob, at: 30.days.from_now do create_inbound_email_from_fixture("welcome.eml").bounced! end end @@ -20,7 +20,7 @@ class ActionMailbox::InboundEmail::IncinerationTest < ActiveSupport::TestCase test "incinerating 30 days after failure" do freeze_time - assert_enqueued_with job: ActionMailbox::InboundEmail::IncinerationJob, at: 30.days.from_now do + assert_enqueued_with job: ActionMailbox::IncinerationJob, at: 30.days.from_now do create_inbound_email_from_fixture("welcome.eml").failed! end end diff --git a/test/unit/mailbox/routing_test.rb b/test/unit/mailbox/routing_test.rb index 320dee6aab..f30199b7af 100644 --- a/test/unit/mailbox/routing_test.rb +++ b/test/unit/mailbox/routing_test.rb @@ -23,7 +23,7 @@ class ActionMailbox::Base::RoutingTest < ActiveSupport::TestCase test "delayed routing" do perform_enqueued_jobs only: ActionMailbox::RoutingJob do - another_inbound_email = create_inbound_email_from_fixture("welcome.eml", status: :pending) + create_inbound_email_from_fixture "welcome.eml", status: :pending assert_equal "Discussion: Let's debate these attachments", $processed end end |