diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-10 16:52:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-10 16:52:00 -0300 |
| commit | 3229eda00c2a38526787fddb6cc307cfee5c5ac6 (patch) | |
| tree | 9b45bf0c52e5b20ab403a5ac0025b9b1b18a5ce3 /actionmailer/lib | |
| parent | 6e76031e8f1f815b390f966cb21e25c66e5ded50 (diff) | |
| parent | ff1b7e75357eb7797f25aeab33994765130db67f (diff) | |
| download | rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.tar.gz rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.tar.bz2 rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.zip | |
Merge pull request #11218 from kaspth/loofah-integration
Loofah-integration
Conflicts:
actionpack/CHANGELOG.md
actionview/CHANGELOG.md
Diffstat (limited to 'actionmailer/lib')
| -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 |