Clear ActionMailer deliveries on setup and teardown

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index 65e7347ae4..b045e883ad 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -15,10 +15,12 @@ module ActionMailer
       extend ActiveSupport::Concern
 
       included do
+        setup :clear_test_deliveries
         teardown :clear_test_deliveries
       end
 
       private
+
       def clear_test_deliveries
         if ActionMailer::Base.delivery_method == :test
           ActionMailer::Base.deliveries.clear
@@ -76,6 +78,7 @@ module ActionMailer
           set_delivery_method :test
           @old_perform_deliveries = ActionMailer::Base.perform_deliveries
           ActionMailer::Base.perform_deliveries = true
+          ActionMailer::Base.deliveries.clear
         end
 
         def restore_test_deliveries # :nodoc:
@@ -89,6 +92,7 @@ module ActionMailer
         end
 
         def restore_delivery_method # :nodoc:
+          ActionMailer::Base.deliveries.clear
           ActionMailer::Base.delivery_method = @old_delivery_method
         end
 
@@ -114,6 +118,5 @@ module ActionMailer
     end
 
     include Behavior
-    include ClearTestDeliveries
   end
 end