Merge branch 'master' into activejob

1 files changed, 3 insertions, 1 deletions

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 6116d1e29f..fd5f4e2831 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -11,6 +11,8 @@ require 'mailers/asset_mailer'
 
 class BaseTest < ActiveSupport::TestCase
   setup do
+    @original_delivery_method = ActionMailer::Base.delivery_method
+    ActionMailer::Base.delivery_method = :test
     @original_asset_host = ActionMailer::Base.asset_host
     @original_assets_dir = ActionMailer::Base.assets_dir
   end
@@ -19,6 +21,7 @@ class BaseTest < ActiveSupport::TestCase
     ActionMailer::Base.asset_host = @original_asset_host
     ActionMailer::Base.assets_dir = @original_assets_dir
     BaseMailer.deliveries.clear
+    ActionMailer::Base.delivery_method = @original_delivery_method
   end
 
   test "method call to mail does not raise error" do
@@ -468,7 +471,6 @@ class BaseTest < ActiveSupport::TestCase
   end
 
   test "calling deliver on the action should increment the deliveries collection if using the test mailer" do
-    BaseMailer.delivery_method = :test
     BaseMailer.welcome.deliver
     assert_equal(1, BaseMailer.deliveries.length)
   end