Skip to content

Commit e1ceb86

Browse files
committed
[IMP] website: adapt edit_menus tour
`edit_menus` tour was broken and disabled after the new website builder changes. This commit adapts the tour steps accordingly and re-enables the related test.
1 parent 60d7d15 commit e1ceb86

File tree

2 files changed

+9
-26
lines changed

2 files changed

+9
-26
lines changed

addons/website/static/tests/tours/edit_menus.js

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import {
55
clickOnEditAndWaitEditMode,
66
clickOnExtraMenuItem,
77
clickOnSave,
8+
goBackToBlocks,
89
insertSnippet,
10+
openLinkPopup,
911
registerWebsitePreviewTour,
1012
} from '@website/js/tours/tour_utils';
1113

@@ -65,14 +67,10 @@ registerWebsitePreviewTour('edit_menus', {
6567
},
6668
// Add a menu item in edit mode.
6769
...clickOnEditAndWaitEditMode(),
68-
{
69-
content: "Click on a menu item",
70-
trigger: ":iframe .top_menu .nav-item a",
71-
run: "click",
72-
},
70+
...openLinkPopup(":iframe .top_menu .nav-item a:contains('Home')", "Home"),
7371
{
7472
content: "Click on Edit Menu",
75-
trigger: ':iframe .o_edit_menu_popover a.js_edit_menu',
73+
trigger: '.o-we-linkpopover a.js_edit_menu',
7674
run: "click",
7775
},
7876
{
@@ -127,27 +125,16 @@ registerWebsitePreviewTour('edit_menus', {
127125
{
128126
trigger: "body:not(:has(.modal))",
129127
},
130-
{
131-
trigger: "#oe_snippets.o_loaded",
132-
},
133128
// Edit the new menu item from the "edit link" popover button
134129
clickOnExtraMenuItem({}, true),
135-
{
136-
trigger: ".o_website_preview.editor_enable.editor_has_snippets:not(.o_is_blocked)",
137-
},
138-
{
139-
content: "Menu should have a new link item",
140-
trigger: ':iframe .top_menu .nav-item a:contains("Random!")',
141-
// Don't click the new menu when the editor is still blocked.
142-
run: "click",
143-
},
130+
...openLinkPopup(":iframe .top_menu .nav-item a:contains('Random!')", "Random!"),
144131
{
145132
content: "navbar shouldn't have any zwnbsp and no o_link_in_selection class",
146133
trigger: ':iframe nav.navbar:not(:has(.o_link_in_selection)):not(:contains("\ufeff"))',
147134
},
148135
{
149136
content: "Click on Edit Link",
150-
trigger: ':iframe .o_edit_menu_popover a.o_we_edit_link',
137+
trigger: '.o-we-linkpopover a.o_we_edit_link',
151138
run: "click",
152139
},
153140
{
@@ -169,14 +156,10 @@ registerWebsitePreviewTour('edit_menus', {
169156
// Edit the menu item from the "edit menu" popover button
170157
...clickOnEditAndWaitEditMode(),
171158
clickOnExtraMenuItem({}, true),
172-
{
173-
content: "Click on the 'Modnar' link",
174-
trigger: ':iframe .top_menu .nav-item a:contains("Modnar")',
175-
run: "click",
176-
},
159+
...openLinkPopup(":iframe .top_menu .nav-item a:contains('Modnar')", "Modnar"),
177160
{
178161
content: "Click on the popover Edit Menu button",
179-
trigger: ':iframe .o_edit_menu_popover a.js_edit_menu',
162+
trigger: '.o-we-linkpopover a.js_edit_menu',
180163
run: "click",
181164
},
182165
{
@@ -206,6 +189,7 @@ registerWebsitePreviewTour('edit_menus', {
206189
run: "click",
207190
},
208191
// Drag a block to be able to scroll later.
192+
goBackToBlocks(),
209193
...insertSnippet({ id: "s_media_list", name: "Media List", groupName: "Content" }),
210194
...clickOnSave(),
211195
clickOnExtraMenuItem({}, true),

addons/website/tests/test_ui.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ def test_16_website_edit_megamenu(self):
515515
def test_website_megamenu_active_nav_link(self):
516516
self.start_tour(self.env['website'].get_client_action_url('/'), 'megamenu_active_nav_link', login='admin')
517517

518-
@unittest.skip
519518
def test_17_website_edit_menus(self):
520519
self.start_tour(self.env['website'].get_client_action_url('/'), 'edit_menus', login='admin')
521520

0 commit comments

Comments
 (0)