NextERP/design-themes
2
0
Fork 0
mirror of https://github.com/odoo/design-themes.git synced 2025-10-07 01:18:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] test_themes: allow s_something_xxx as a variant of s_xxx

Browse Source 
The testing suite tests, among other things, that a s_xxx_yyy class can
only be used on a sub-element (or the same element) of a s_xxx one (or
being on the root element, as being the name of the snippet).

This commit now also allows s_something_xxx (so prefixing instead of
suffixing) when on the same element. E.g. "s_newsletter_benefits_popup"
alongside the "s_popup" class for the new "s_newsletter_benefits_popup"
snippet.

Related to task-4306887
Part of task-4077427

closes odoo/design-themes#1130

Related: odoo/odoo#186820
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
qsm-odoo
2025-08-18 16:02:23 +02:00
parent 91e937e0a4
commit c1d077604e
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_themes/tests/test_new_page_templates.py
+22 -5
View File
@@ -230,11 +230,29 @@ class TestNewPageTemplates(TransactionCase):
if cl.startswith('s_') and cl not in S_CLASSES_WHITELIST
}
if non_whitelisted_s_classes:
all_parent_s_classes = set()
parent_el = el
is_in_snippet = view.key.startswith('website.configurator_')
# Check the element classes itself first: if
# there is a s_XXX class, s_something_XXX is
# automatically accepted as it indicates a
# variant of s_XXX (e.g. s_nice_popup being a
# variant of s_popup).
non_whitelisted_s_classes = {
cl for cl in non_whitelisted_s_classes
if not any(cl != other_cl and cl.endswith(f'_{other_cl[2:]}')
for other_cl in non_whitelisted_s_classes)
}
# Find all parent elements classes that start
# with 's_' (including on the current element).
# and only accept classes that are prefixed by
# a parent class (+ '_') (e.g. s_table_item
# would be accepted inside a s_table (as it is
# a sub-element of s_table), and s_table_xs
# would be accepted as an option of s_table)).
all_parent_s_classes = set()
parent_el = el
# This also looks for the presence of non-
# whitelisted 's_' classes in non-snippets.
is_in_snippet = view.key.startswith('website.configurator_')
while parent_el is not None:
parent_classes = set(parent_el.attrib.get('class', '').split())
all_parent_s_classes.update({cl for cl in parent_classes if cl.startswith('s_')})
@@ -242,9 +260,8 @@ class TestNewPageTemplates(TransactionCase):
is_in_snippet = True
break
parent_el = parent_el.getparent()
if is_in_snippet:
# Accept classes that are prefixed by such a
# parent class (+ '_').
non_whitelisted_s_classes = {
cl for cl in non_whitelisted_s_classes
if not any(cl.startswith(f'{parent_cls}_') for parent_cls in all_parent_s_classes)