vendor/rails/actionmailer/lib/action_mailer/test_case.rb in radiant-0.6.9 vs vendor/rails/actionmailer/lib/action_mailer/test_case.rb in radiant-0.7.0

@@ -6,15 +6,17 @@
       super "Unable to determine the mailer to test from #{name}. " +
         "You'll need to specify it using tests YourMailer in your " +
         "test case definition"
     end
   end
-  # New Test Super class for forward compatibility.
-  # To override
+
   class TestCase < ActiveSupport::TestCase
     include ActionMailer::Quoting
 
+    setup :initialize_test_deliveries
+    setup :set_expected_mail
+
     class << self
       def tests(mailer)
         write_inheritable_attribute(:mailer_class, mailer)
       end
 
@@ -31,18 +33,21 @@
       rescue NameError => e
         raise NonInferrableMailerError.new(name)
       end
     end
 
-    def setup
-      ActionMailer::Base.delivery_method = :test
-      ActionMailer::Base.perform_deliveries = true
-      ActionMailer::Base.deliveries = []
+    protected
+      def initialize_test_deliveries
+        ActionMailer::Base.delivery_method = :test
+        ActionMailer::Base.perform_deliveries = true
+        ActionMailer::Base.deliveries = []
+      end
 
-      @expected = TMail::Mail.new
-      @expected.set_content_type "text", "plain", { "charset" => charset }
-      @expected.mime_version = '1.0'
-    end
+      def set_expected_mail
+        @expected = TMail::Mail.new
+        @expected.set_content_type "text", "plain", { "charset" => charset }
+        @expected.mime_version = '1.0'
+      end
 
     private
       def charset
         "utf-8"
       end