summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2024-12-02 01:31:02 +0000
committerGo MAEDA <maeda@farend.jp>2024-12-02 01:31:02 +0000
commitecc6f3e438a53206cdb5c2ee0e44fbdae35f64a7 (patch)
tree86c6bfefbfa4a055ee58b2936ee232c237fe149e
parent4d79219d604a3a858bc504ddedc957553ae08aef (diff)
downloadredmine-ecc6f3e438a53206cdb5c2ee0e44fbdae35f64a7.tar.gz
redmine-ecc6f3e438a53206cdb5c2ee0e44fbdae35f64a7.zip
Merged r23343 and r23345 from trunk to 6.0-stable (#41914).
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23346 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/unit/user_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 2de0b45db..5698a1b8d 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -564,6 +564,7 @@ class UserTest < ActiveSupport::TestCase
end
def test_validate_password_complexity
+ set_language_if_valid 'en'
user = users(:users_002)
bad_passwords = [
user.login,
@@ -577,7 +578,7 @@ class UserTest < ActiveSupport::TestCase
user.password = p
user.password_confirmation = p
assert_not user.save
- assert user.errors.full_messages.include?('Password is too simple')
+ assert_includes user.errors.full_messages, 'Password is too simple'
end
end