Permalink
Browse files

Remove old workaround for mocha bug. [#3886 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information...
1 parent e9793c6 commit f415b3e6d18f0e018e08f2af8e19e40ac93a8524 @floehopper floehopper committed with spastorino Oct 8, 2010
Showing with 1 addition and 4 deletions.
  1. +1 −4 actionmailer/test/old_base/mail_service_test.rb
@@ -328,22 +328,19 @@ def new_mail( charset="UTF-8" )
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
ActionMailer::Base.raise_delivery_errors = true
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 @@ def test_starttls_is_not_enabled
ensure
TestMailer.smtp_settings.merge!(:enable_starttls_auto => true)
end
-end
+end

0 comments on commit f415b3e

Please sign in to comment.