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

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

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index dde1cdd6226cb89f4d8e2d7ff735c62c5bbff9b4..53e7693ff24a714b589b1d7ca7af4f300c287aa5 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1099,7 +1099,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?