Move ActionMailer::TC to AV::TC::Behavior

[#4843 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

actionmailer/lib/action_mailer/test_case.rb

@@ -8,12 +8,12 @@ def initialize(name)
   end
 
   class TestCase < ActiveSupport::TestCase
+    module Behavior
+      extend ActiveSupport::Concern
+
       include TestHelper
 
-    setup :initialize_test_deliveries
-    setup :set_expected_mail
-
-    class << self
+      module ClassMethods
         def tests(mailer)
           write_inheritable_attribute(:mailer_class, mailer)
         end
@@ -33,7 +33,10 @@ def determine_default_mailer(name)
         end
       end
 
+      module InstanceMethods
+
       protected
+
         def initialize_test_deliveries
           ActionMailer::Base.delivery_method = :test
           ActionMailer::Base.perform_deliveries = true
@@ -47,6 +50,7 @@ def set_expected_mail
         end
 
       private
+
         def charset
           "UTF-8"
         end
@@ -59,4 +63,14 @@ def read_fixture(action)
           IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
         end
       end
+
+      included do
+        setup :initialize_test_deliveries
+        setup :set_expected_mail
+      end
+    end
+
+    include Behavior
+
+  end
 end

actionmailer/lib/action_mailer/test_helper.rb

@@ -1,5 +1,7 @@
 module ActionMailer
   module TestHelper
+    extend ActiveSupport::Concern
+
     # Asserts that the number of emails sent matches the given number.
     #
     #   def test_emails
@@ -57,11 +59,3 @@ def assert_no_emails(&block)
     end
   end
 end
-
-module Test
-  module Unit
-    class TestCase
-      include ActionMailer::TestHelper
-    end
-  end
-end

actionmailer/test/old_base/mail_service_test.rb

@@ -1113,6 +1113,8 @@ def test_attr
 end
 
 class MethodNamingTest < ActiveSupport::TestCase
+  include ActionMailer::TestHelper
+
   class TestMailer < ActionMailer::Base
     def send
       body       'foo'