diff options
| author | Timm <kaspth@gmail.com> | 2014-05-28 12:55:01 +0200 |
|---|---|---|
| committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:26 +0200 |
| commit | ff1b7e75357eb7797f25aeab33994765130db67f (patch) | |
| tree | 22d790d1ce2927f9985664930a526c9b1d73d572 /actionmailer | |
| parent | 9c9875b059f3d41a919cc628b610d8f6b4b7e24d (diff) | |
| download | rails-ff1b7e75357eb7797f25aeab33994765130db67f.tar.gz rails-ff1b7e75357eb7797f25aeab33994765130db67f.tar.bz2 rails-ff1b7e75357eb7797f25aeab33994765130db67f.zip | |
Restore delivery method on teardowns.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index a5442c0316..9207c1bc56 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -55,14 +55,13 @@ module ActionMailer protected def initialize_test_deliveries - @old_delivery_method = ActionMailer::Base.delivery_method + set_delivery_method :test @old_perform_deliveries = ActionMailer::Base.perform_deliveries - ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true end def restore_test_deliveries - ActionMailer::Base.delivery_method = @old_delivery_method + restore_delivery_method ActionMailer::Base.perform_deliveries = @old_perform_deliveries ActionMailer::Base.deliveries.clear end |