Skip to content

[FIX] website_sale,*: adapt tours #4557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2025
Merged

[FIX] website_sale,*: adapt tours #4557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33ddce7
[FIX] website_sale: adapt tour check_free_delivery
chdh-odoo May 5, 2025
35fa521
[FIX] website_event_sale: adapt tour test_buy_last_ticket
chdh-odoo May 5, 2025
9ca8dc9
[FIX] website_sale: adapt tour test_category_page_and_products_snippet
chdh-odoo May 6, 2025
ef39d22
[FIX] website_event_sale: adapt test test_demo
chdh-odoo May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions addons/website_event_sale/tests/test_frontend_buy_tickets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ def test_admin(self):

self.start_tour("/", 'event_buy_tickets', login="admin")

# TODO master-mysterious-egg fix error
@unittest.skip("prepare mysterious-egg for merging")
def test_demo(self):
self.env['product.pricelist'].with_context(active_test=False).search([]).unlink()
transfer_provider = self.env.ref('payment.payment_provider_transfer')
Expand All @@ -108,8 +106,6 @@ def test_demo(self):

self.start_tour("/", 'event_buy_tickets', login="demo")

# TODO master-mysterious-egg fix error
@unittest.skip("prepare mysterious-egg for merging")
def test_buy_last_ticket(self):
transfer_provider = self.env.ref('payment.payment_provider_transfer')
transfer_provider.write({
Expand Down
12 changes: 8 additions & 4 deletions addons/website_sale/static/tests/tours/website_sale_category_page_and_products_snippet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ registerWebsitePreviewTour('category_page_and_products_snippet_edition', {
trigger: ':iframe .o_wsale_filmstip > li:contains("Test Category") > a',
run: "click",
},
{
content: "Wait for page to load",
trigger: ":iframe",
},
...clickOnEditAndWaitEditMode(),
{
trigger: ".o_website_preview.editor_enable.editor_has_snippets",
trigger: ".o-website-builder_sidebar .o_snippets_container .o_snippet",
},
{
content: "Drag and drop the Products snippet group inside the category area.",
trigger: '#oe_snippets .oe_snippet[name="Products"] .oe_snippet_thumbnail:not(.o_we_ongoing_insertion)',
trigger: ".o-website-builder_sidebar .o_snippet[name='Products'] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)",
run: "drag_and_drop :iframe #category_header",
},
{
Expand All @@ -32,12 +36,12 @@ registerWebsitePreviewTour('category_page_and_products_snippet_edition', {
},
{
content: "Open category option dropdown",
trigger: 'we-select[data-attribute-name="productCategoryId"] we-toggler',
trigger: "button[id='product_category_opt']'",
run: "click",
},
{
content: "Choose the option to use the current page's category",
trigger: 'we-button[data-select-data-attribute="current"]',
trigger: "div.o-dropdown-item:contains('Current Category or All')",
run: "click",
},
...clickOnSave(),
Expand Down
2 changes: 0 additions & 2 deletions addons/website_sale/tests/test_delivery_ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

@odoo.tests.tagged('post_install', '-at_install')
class TestUi(odoo.tests.HttpCase):
# TODO master-mysterious-egg fix error
@unittest.skip("prepare mysterious-egg for merging")
def test_01_free_delivery_when_exceed_threshold(self):
if self.env['ir.module.module']._get('payment_custom').state != 'installed':
self.skipTest("Transfer provider is not installed")
Expand Down
4 changes: 1 addition & 3 deletions addons/website_sale/tests/test_website_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ def setUpClass(cls):
cls.user_website_user.group_ids += cls.env.ref('sales_team.group_sale_manager')
cls.user_website_user.group_ids += cls.env.ref('product.group_product_manager')

# TODO master-mysterious-egg fix error
@unittest.skip("prepare mysterious-egg for merging")
def test_category_page_and_products_snippet(self):
category = self.env['product.public.category'].create({
'name': 'Test Category',
Expand All @@ -256,7 +254,7 @@ def test_category_page_and_products_snippet(self):
'name': 'Test Product Outside Category',
'website_published': True,
})
self.start_tour(self.env['website'].get_client_action_url('/shop'), 'category_page_and_products_snippet_edition', login="website_user")
self.start_tour(self.env['website'].get_client_action_url('/shop'), 'category_page_and_products_snippet_edition', login="admin")
self.start_tour('/shop', 'category_page_and_products_snippet_use', login=None)

# TODO master-mysterious-egg fix error
Expand Down