[IMP] website: adapt edit_menus tour

Author: aans-odoo

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

@@ -4,7 +4,9 @@ import {
     clickOnEditAndWaitEditMode,
     clickOnExtraMenuItem,
     clickOnSave,
+    goBackToBlocks,
     insertSnippet,
+    openLinkPopup,
     registerWebsitePreviewTour,
 } from '@website/js/tours/tour_utils';
 
@@ -55,24 +57,17 @@ registerWebsitePreviewTour('edit_menus', {
     {
         trigger: "body:not(:has(.oe_menu_editor))",
     },
-    {
-        trigger: ":iframe body:contains(welcome to your)",
-    },
     clickOnExtraMenuItem({}, true),
     {
         content: "There should be a new megamenu item.",
         trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
     },
     // Add a menu item in edit mode.
     ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Click on a menu item",
-        trigger: ":iframe .top_menu .nav-item a",
-        run: "click",
-    },
+    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Home')", "Home"),
     {
         content: "Click on Edit Menu",
-        trigger: ':iframe .o_edit_menu_popover a.js_edit_menu',
+        trigger: '.o-we-linkpopover a.js_edit_menu',
         run: "click",
     },
     {
@@ -127,27 +122,16 @@ registerWebsitePreviewTour('edit_menus', {
     {
         trigger: "body:not(:has(.modal))",
     },
-    {
-        trigger: "#oe_snippets.o_loaded",
-    },
     // Edit the new menu item from the "edit link" popover button
     clickOnExtraMenuItem({}, true),
-    {
-        trigger: ".o_website_preview.editor_enable.editor_has_snippets:not(.o_is_blocked)",
-    },
-    {
-        content: "Menu should have a new link item",
-        trigger: ':iframe .top_menu .nav-item a:contains("Random!")',
-        // Don't click the new menu when the editor is still blocked.
-        run: "click",
-    },
+    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Random!')", "Random!"),
     {
         content: "navbar shouldn't have any zwnbsp and no o_link_in_selection class",
         trigger: ':iframe nav.navbar:not(:has(.o_link_in_selection)):not(:contains("\ufeff"))',
     },
     {
         content: "Click on Edit Link",
-        trigger: ':iframe .o_edit_menu_popover a.o_we_edit_link',
+        trigger: '.o-we-linkpopover a.o_we_edit_link',
         run: "click",
     },
     {
@@ -169,14 +153,10 @@ registerWebsitePreviewTour('edit_menus', {
     // Edit the menu item from the "edit menu" popover button
     ...clickOnEditAndWaitEditMode(),
     clickOnExtraMenuItem({}, true),
-    {
-        content: "Click on the 'Modnar' link",
-        trigger: ':iframe .top_menu .nav-item a:contains("Modnar")',
-        run: "click",
-    },
+    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Modnar')", "Modnar"),
     {
         content: "Click on the popover Edit Menu button",
-        trigger: ':iframe .o_edit_menu_popover a.js_edit_menu',
+        trigger: '.o-we-linkpopover a.js_edit_menu',
         run: "click",
     },
     {
@@ -206,6 +186,7 @@ registerWebsitePreviewTour('edit_menus', {
         run: "click",
     },
     // Drag a block to be able to scroll later.
+    goBackToBlocks(),
     ...insertSnippet({ id: "s_media_list", name: "Media List", groupName: "Content" }),
     ...clickOnSave(),
     clickOnExtraMenuItem({}, true),

addons/website/tests/test_ui.py

@@ -517,7 +517,6 @@ def test_16_website_edit_megamenu(self):
     def test_website_megamenu_active_nav_link(self):
         self.start_tour(self.env['website'].get_client_action_url('/'), 'megamenu_active_nav_link', login='admin')
 
-    @unittest.skip
     def test_17_website_edit_menus(self):
         self.start_tour(self.env['website'].get_client_action_url('/'), 'edit_menus', login='admin')