From 852b22039b6c647f8ba6f609799c6765a2ea10e6 Mon Sep 17 00:00:00 2001 From: James Mead Date: Sun, 7 Feb 2010 18:42:56 +0000 Subject: [PATCH] In commit 704f2cc6dee9d55d19bfad8e4a8308fdee71bf6f a couple of lines of code were adding with the following comment: "Replacing logger work around for mocha bug. Should be fixed in mocha 0.3.3". Since the Rails Gemfile now specifies Mocha >= 0.9.8 and since the ActionMailer tests still pass when these lines are removed, it seems sensible to remove them. --- actionmailer/test/old_base/mail_service_test.rb | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 70dafaf..142860e 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -331,19 +331,16 @@ 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 ActionMailer::Base.raise_delivery_errors = true ActionMailer::Base.deliveries.clear - @original_logger = TestMailer.logger @recipient = 'test@localhost' end def teardown - TestMailer.logger = @original_logger restore_delivery_method end -- 1.6.0.5