use with_settings at UsersControllerTest#test_update_with_generate_password_should_em...

git-svn-id: http://svn.redmine.org/redmine/trunk@20413 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 4d3f877b234837b6c88f20803218123e9107feaa..dfc6be8489c8052744840b72e581c0da02fba657 100644 (file)
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -592,24 +592,28 @@ class UsersControllerTest < Redmine::ControllerTest
 
   def test_update_with_generate_password_should_email_the_password
     ActionMailer::Base.deliveries.clear
-    Setting.bcc_recipients = '1'
-
-    put :update, :params => {
-      :id => 2,
-      :user => {
-        :generate_password => '1',
-        :password => '',
-        :password_confirmation => ''
-      },
-      :send_information => '1'
-    }
-
+    with_settings :bcc_recipients => '1' do
+      put(
+        :update,
+        :params => {
+          :id => 2,
+          :user => {
+            :generate_password => '1',
+            :password => '',
+            :password_confirmation => ''
+          },
+          :send_information => '1'
+        }
+      )
+    end
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
+    u = User.find(2)
+    assert_equal [u.mail], mail.bcc
     m = mail_body(mail).match(/Password: ([a-zA-Z0-9]+)/)
     assert m
     password = m[1]
-    assert User.find(2).check_password?(password)
+    assert u.check_password?(password)
   end
 
   def test_update_without_generate_password_should_not_change_password