diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-03-15 20:36:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 20:36:51 +0100 |
| commit | 49c8f94412ae2623a504f71962199225ed6fb675 (patch) | |
| tree | ca584ea04ced2dfd2ff133f19f92c86335add76b /actionmailer | |
| parent | 3094272493ab00646ee4ffcb515ee83978eeb394 (diff) | |
| parent | 10cc06809d3cc77f861b44b866b8d0577497a574 (diff) | |
| download | rails-49c8f94412ae2623a504f71962199225ed6fb675.tar.gz rails-49c8f94412ae2623a504f71962199225ed6fb675.tar.bz2 rails-49c8f94412ae2623a504f71962199225ed6fb675.zip | |
Merge pull request #32244 from bogdanvlviv/partly-revert-32231
Partly revert #32231
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/test_helper.rb b/actionmailer/lib/action_mailer/test_helper.rb index ec748236b4..e9ddef3b94 100644 --- a/actionmailer/lib/action_mailer/test_helper.rb +++ b/actionmailer/lib/action_mailer/test_helper.rb @@ -14,7 +14,7 @@ module ActionMailer # assert_emails 0 # ContactMailer.welcome.deliver_now # assert_emails 1 - # ContactMailer.welcome.deliver_later + # ContactMailer.welcome.deliver_now # assert_emails 2 # end # @@ -38,9 +38,7 @@ module ActionMailer new_count = ActionMailer::Base.deliveries.size assert_equal number, new_count - original_count, "#{number} emails expected, but #{new_count - original_count} were sent" else - perform_enqueued_jobs(only: [ActionMailer::DeliveryJob, ActionMailer::Parameterized::DeliveryJob]) do - assert_equal number, ActionMailer::Base.deliveries.size - end + assert_equal number, ActionMailer::Base.deliveries.size end end |