1 files changed, 38 insertions, 0 deletions
diff --git a/actionmailer/test/test_case_test.rb b/actionmailer/test/test_case_test.rb
index 86fd37bea6..5d8d3c3b36 100644
--- a/actionmailer/test/test_case_test.rb
+++ b/actionmailer/test/test_case_test.rb
@@ -3,6 +3,44 @@ require 'abstract_unit'
 class TestTestMailer < ActionMailer::Base
 end
 
+class ClearTestDeliveriesMixinTest < ActiveSupport::TestCase
+  include ActionMailer::TestCase::ClearTestDeliveries
+
+  def before_setup
+    ActionMailer::Base.delivery_method, @original_delivery_method = :test, ActionMailer::Base.delivery_method
+    ActionMailer::Base.deliveries << 'better clear me, setup'
+    super
+  end
+
+  def after_teardown
+    super
+    assert_equal [], ActionMailer::Base.deliveries
+    ActionMailer::Base.delivery_method = @original_delivery_method
+  end
+
+  def test_deliveries_are_cleared_on_setup_and_teardown
+    assert_equal [], ActionMailer::Base.deliveries
+    ActionMailer::Base.deliveries << 'better clear me, teardown'
+  end
+end
+
+class MailerDeliveriesClearingTest < ActionMailer::TestCase
+  def before_setup
+    ActionMailer::Base.deliveries << 'better clear me, setup'
+    super
+  end
+
+  def after_teardown
+    super
+    assert_equal [], ActionMailer::Base.deliveries
+  end
+
+  def test_deliveries_are_cleared_on_setup_and_teardown
+    assert_equal [], ActionMailer::Base.deliveries
+    ActionMailer::Base.deliveries << 'better clear me, teardown'
+  end
+end
+
 class CrazyNameMailerTest < ActionMailer::TestCase
   tests TestTestMailer