From 2cf45366ecbd929058ecb953af76c930b89cba16 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 15 Aug 2022 13:52:32 +0200 Subject: [PATCH] test: merge password validation test cases --- frappe/core/doctype/user/test_user.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index df3993e31c..d4536c6355 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -192,6 +192,12 @@ class TestUser(unittest.TestCase): # Score 1; should now fail result = test_password_strength("bee2ve") self.assertEqual(result["feedback"]["password_policy_validation_passed"], False) + self.assertRaises( + frappe.exceptions.ValidationError, handle_password_test_fail, result["feedback"] + ) + self.assertRaises( + frappe.exceptions.ValidationError, handle_password_test_fail, result + ) # test backwards compatibility # Score 4; should pass result = test_password_strength("Eastern_43A1W") @@ -207,15 +213,6 @@ class TestUser(unittest.TestCase): user.save() frappe.flags.in_test = True - def test_password_validation(self): - result = test_password_strength("P@ssw0rd") - feedback = result["feedback"] - self.assertEqual(feedback["password_policy_validation_passed"], False) - self.assertRaises(frappe.exceptions.ValidationError, handle_password_test_fail, feedback) - - # test backwards compatibility - self.assertRaises(frappe.exceptions.ValidationError, handle_password_test_fail, result) - def test_comment_mentions(self): comment = """