diff options
| -rw-r--r-- | actionmailer/test/old_base/mail_service_test.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 93921978b6..0b5b0b2da3 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -328,7 +328,6 @@ class ActionMailerTest < Test::Unit::TestCase mail end - # Replacing logger work around for mocha bug. Should be fixed in mocha 0.3.3 def setup set_delivery_method :test ActionMailer::Base.perform_deliveries = true @@ -336,14 +335,12 @@ class ActionMailerTest < Test::Unit::TestCase ActionMailer::Base.deliveries.clear ActiveSupport::Deprecation.silenced = true - @original_logger = TestMailer.logger @recipient = 'test@localhost' TestMailer.delivery_method = :test end def teardown - TestMailer.logger = @original_logger ActiveSupport::Deprecation.silenced = false restore_delivery_method end @@ -1097,4 +1094,4 @@ EOF ensure TestMailer.smtp_settings.merge!(:enable_starttls_auto => true) end -end
\ No newline at end of file +end |