From 057d32a02daac7b15a6a46a11f7ba9c241443d49 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 7 Aug 2024 18:16:52 +0530 Subject: [PATCH] fix(test): complete workspace setup before running UI tests --- .../navbar_settings/navbar_settings.py | 20 ------------------- frappe/patches.txt | 2 +- frappe/tests/ui_test_helpers.py | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.py b/frappe/core/doctype/navbar_settings/navbar_settings.py index 18b9ff1ea7..55e33cd61a 100644 --- a/frappe/core/doctype/navbar_settings/navbar_settings.py +++ b/frappe/core/doctype/navbar_settings/navbar_settings.py @@ -22,26 +22,6 @@ class NavbarSettings(Document): settings_dropdown: DF.Table[NavbarItem] # end: auto-generated types - def validate(self): - self.validate_standard_navbar_items() - - def validate_standard_navbar_items(self): - doc_before_save = self.get_doc_before_save() - - if not doc_before_save: - return - - before_save_items = [ - item - for item in doc_before_save.help_dropdown + doc_before_save.settings_dropdown - if item.is_standard - ] - - after_save_items = [item for item in self.help_dropdown + self.settings_dropdown if item.is_standard] - - if not frappe.flags.in_patch and (len(before_save_items) > len(after_save_items)): - frappe.throw(_("Please hide the standard navbar items instead of deleting them")) - def get_app_logo(): app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) diff --git a/frappe/patches.txt b/frappe/patches.txt index 275e667a49..cead1d85ad 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -237,5 +237,5 @@ frappe.patches.v15_0.migrate_session_data frappe.custom.doctype.property_setter.patches.remove_invalid_fetch_from_expressions frappe.patches.v16_0.switch_default_sort_order frappe.integrations.doctype.oauth_client.patches.set_default_allowed_role_in_oauth_client -execute:frappe.db.set_single_value("Website Settings", "workspace_setup_completed", 1) +execute:frappe.db.set_single_value("Workspace Settings", "workspace_setup_completed", 1) diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 1993795649..4347434959 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -449,7 +449,7 @@ def create_test_user(username=None): user.save() - frappe.db.set_single_value("Website Settings", "workspace_setup_completed", 1) + frappe.db.set_single_value("Workspace Settings", "workspace_setup_completed", 1) @whitelist_for_tests