Merge remote-tracking branch 'upstream/pull/3767'

[rails.git] / test / controllers / users_controller_test.rb

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 8ad9c6fab6f416908f68b3fdffa48e4d2182da11..b398762f20a57a718d783e2294ec498f9e7adca1 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -87,8 +87,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => user.display_name
 
     # Check the page
     assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => user.display_name

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_create_duplicate_email
   end
 
   def test_create_duplicate_email


@@ -189,8 +187,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
         perform_enqueued_jobs
       end
     end
         perform_enqueued_jobs
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_go_public
   end
 
   def test_go_public