Merged r21705 from trunk to 4.2-stable (#37449).

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21712 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 8aac3ed72ca88eeac4cb512ffca6b9c5c9ded794..bd536899a9749baf13e76480fe8a000893295aec 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1098,7 +1098,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_random_password_include_required_characters
-    with_settings :password_required_char_classes => Setting::PASSWORD_CHAR_CLASSES do
+    with_settings :password_required_char_classes => Setting::PASSWORD_CHAR_CLASSES.keys do
       u = User.new(:firstname => "new", :lastname => "user", :login => "random", :mail => "random@somnet.foo")
       u.random_password
       assert u.valid?