From 8233c2ffced7ab75dd31ee9d3f7b7093fc434d83 Mon Sep 17 00:00:00 2001 From: Sumit Bhanushali Date: Sun, 8 Dec 2024 10:04:50 +0530 Subject: [PATCH] fix: naming tests should consider pattern for generating series --- frappe/tests/test_naming.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index d52f48c3ec..21c24e34d0 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -103,7 +103,8 @@ class TestNaming(IntegrationTestCase): doc.some_fieldname = description doc.insert() - series = getseries("", 2) + series = getseries(f"TODO-{now_datetime().strftime('%m')}-{description}-", 2) + series = int(series) - 1 self.assertEqual(doc.name, f"TODO-{now_datetime().strftime('%m')}-{description}-{series:02}") @@ -117,7 +118,7 @@ class TestNaming(IntegrationTestCase): doc.field = field doc.insert() - series = getseries("", 2) + series = getseries(f"TODO-{field}-", 2) series = int(series) - 1 self.assertEqual(doc.name, f"TODO-{field}-{series:02}") @@ -138,15 +139,13 @@ class TestNaming(IntegrationTestCase): todo.description = description todo.insert() - series = getseries("", 2) - + week = determine_consecutive_week_number(now_datetime()) + series = getseries(f"TODO-{week}-", 2) series = str(int(series) - 1) if len(series) < 2: series = "0" + series - week = determine_consecutive_week_number(now_datetime()) - self.assertEqual(todo.name, f"TODO-{week}-{series}") def test_revert_series(self):