Merge pull request #15545 from zuhao/refactor_actionpack_assert_selec…

…t_test Restore test deliveries for ActionMailer.
rails · Jun 8, 2014 · 71f99be · 71f99be
2 parents 376eefa + 64edb6c
commit 71f99be
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
@@ -56,13 +56,16 @@ def xml()
 
   def setup
     super
+    @old_delivery_method = ActionMailer::Base.delivery_method
+    @old_perform_deliveries = ActionMailer::Base.perform_deliveries
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
   end
 
   def teardown
     super
+    ActionMailer::Base.delivery_method = @old_delivery_method
+    ActionMailer::Base.perform_deliveries = @old_perform_deliveries
     ActionMailer::Base.deliveries.clear
   end