vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(test): complete workspace setup before running UI tests

Browse source
This commit is contained in:
Rushabh Mehta 2024-08-07 18:16:52 +05:30
parent 0a00b40cee
commit 057d32a02d
3 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
frappe/core/doctype/navbar_settings/navbar_settings.py
View file

@ -22,26 +22,6 @@ class NavbarSettings(Document):
settings_dropdown: DF.Table[NavbarItem] settings_dropdown: DF.Table[NavbarItem]
# end: auto-generated types # 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(): def get_app_logo():
app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True) app_logo = frappe.db.get_single_value("Navbar Settings", "app_logo", cache=True)

2
frappe/patches.txt
View file

@ -237,5 +237,5 @@ frappe.patches.v15_0.migrate_session_data
frappe.custom.doctype.property_setter.patches.remove_invalid_fetch_from_expressions frappe.custom.doctype.property_setter.patches.remove_invalid_fetch_from_expressions
frappe.patches.v16_0.switch_default_sort_order frappe.patches.v16_0.switch_default_sort_order
frappe.integrations.doctype.oauth_client.patches.set_default_allowed_role_in_oauth_client 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)

2
frappe/tests/ui_test_helpers.py
View file

@ -449,7 +449,7 @@ def create_test_user(username=None):
user.save() 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 @whitelist_for_tests