[IMP] website: adapt tours

* snippet_popup_and_scrollbar

Author: shsa-odoo

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

@@ -33,8 +33,8 @@ const checkScrollbar = function (hasScrollbar) {
     };
 };
 
-const toggleBackdrop = function () {
-    return changeOption('SnippetPopup', 'we-button[data-name="popup_backdrop_opt"] we-checkbox', 'backdrop');
+function toggleBackdrop(snippet) {
+    return changeOption(`${snippet}`, "[data-action-id='setBackdrop'] .form-check-input");
 };
 
 registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
@@ -49,17 +49,17 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
         trigger: ':iframe .s_popup .modal',
         run: "click",
     },
-    toggleBackdrop(), // hide Popup backdrop
+    toggleBackdrop("Popup"), // hide Popup backdrop
     checkScrollbar(true),
     goBackToBlocks(),
     {
         content: "Drag the Content snippet group and drop it at the bottom of the popup.",
-        trigger: '#oe_snippets .oe_snippet[name="Content"] .oe_snippet_thumbnail:not(.o_we_ongoing_insertion)',
+        trigger: '.o-snippets-menu .o_snippet[name="Content"] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)',
         run: "drag_and_drop :iframe #wrap .s_popup .oe_drop_zone:last",
     },
     {
         content: "Click on the s_media_list snippet.",
-        trigger: ':iframe .o_snippet_preview_wrap[data-snippet-id="s_media_list"]',
+        trigger: ':iframe .o_add_snippets_preview [data-snippet="s_media_list"]',
         run: "click",
     },
     checkScrollbar(false),
@@ -70,12 +70,11 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
     },
     {
         content: "Remove the Media List snippet in the Popup.",
-        trigger: ":iframe .oe_overlay.oe_active .oe_snippet_remove",
+        trigger: "body .o_overlay_options .oe_snippet_remove",
         run: "click",
     },
+    toggleBackdrop("Popup"), // show Popup backdrop
     checkScrollbar(true),
-    toggleBackdrop(), // show Popup backdrop
-    checkScrollbar(false),
     {
         content: "Close the Popup that has now backdrop.",
         trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:first",
@@ -88,9 +87,8 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
         run: "click",
     },
     checkScrollbar(true),
-    toggleBackdrop(), // show Cookies Bar backdrop
-    checkScrollbar(false),
-    toggleBackdrop(), // hide Cookies Bar backdrop
+    toggleBackdrop("Cookies Bar"), // show Cookies Bar backdrop
+    toggleBackdrop("Cookies Bar"), // hide Cookies Bar backdrop
     checkScrollbar(true),
     {
         content: "Open the Popup that has backdrop.",
@@ -103,12 +101,12 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
     goBackToBlocks(),
     {
         content: "Drag the Content snippet group and drop it at the bottom of the popup.",
-        trigger: '#oe_snippets .oe_snippet[name="Content"] .oe_snippet_thumbnail:not(.o_we_ongoing_insertion)',
+        trigger: '.o-snippets-menu .o_snippet[name="Content"] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)',
         run: "drag_and_drop :iframe #wrap .s_popup .oe_drop_zone:last",
     },
     {
         content: "Click on the s_media_list snippet.",
-        trigger: ':iframe .o_snippet_preview_wrap[data-snippet-id="s_media_list"]',
+        trigger: ':iframe .o_add_snippets_preview [data-snippet="s_media_list"]',
         run: "click",
     },
     /* task-4185877
@@ -121,7 +119,7 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
     },
     {
         content: "Remove the s_popup snippet",
-        trigger: ".o_we_customize_panel we-customizeblock-options:contains('Popup') we-button.oe_snippet_remove:first",
+        trigger: ".o_customize_tab .options-container[data-container-title='Popup'] .oe_snippet_remove",
         async run(helpers) {
             await helpers.click();
             // TODO: remove the below setTimeout. Without it, goBackToBlocks() not works.
@@ -132,12 +130,12 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
     goBackToBlocks(),
     {
         content: "Drag the Content snippet group and drop it in the Cookies Bar.",
-        trigger: '#oe_snippets .oe_snippet[name="Content"] .oe_snippet_thumbnail:not(.o_we_ongoing_insertion)',
+        trigger: '.o-snippets-menu .o_snippet[name="Content"] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)',
         run: "drag_and_drop :iframe #website_cookies_bar .modal-content.oe_structure",
     },
     {
         content: "Click on the s_media_list snippet.",
-        trigger: ':iframe .o_snippet_preview_wrap[data-snippet-id="s_media_list"]',
+        trigger: ':iframe .o_add_snippets_preview [data-snippet="s_media_list"]',
         run: "click",
     },
     {
@@ -147,21 +145,17 @@ registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
     },
     {
         content: "Duplicate the Media List snippet",
-        trigger: ".o_we_customize_panel we-customizeblock-options:contains('Media List') we-button.oe_snippet_clone:first",
-        run() {
-            // TODO: use run: "click", instead
-            this.anchor.click();
-        }
+        trigger:".o_customize_tab .options-container[data-container-title='Media List'] button.oe_snippet_clone",
+        run: "click",
     },
-    checkScrollbar(false),
     {
         content: "Remove the first Media List snippet in the Cookies Bar.",
-        trigger: ":iframe .oe_overlay.oe_active .oe_snippet_remove",
+        trigger: "body .o_overlay_options .oe_snippet_remove",
         run: "click",
     },
     {
         content: "Remove the second Media List snippet in the Cookies Bar.",
-        trigger: ":iframe .oe_overlay.oe_active .oe_snippet_remove",
+        trigger: "body .o_overlay_options .oe_snippet_remove",
         run: "click",
     },
     checkScrollbar(true),

addons/website/tests/test_snippets.py

@@ -120,12 +120,16 @@ def test_12_snippet_images_wall(self):
         self.start_tour('/', 'snippet_images_wall', login='admin')
 
     @unittest.skip
-    def test_snippet_popup_with_scrollbar_and_animations(self):
+    def test_snippet_popup_with_animations(self):
         website = self.env.ref('website.default_website')
         website.cookies_bar = True
-        self.start_tour(self.env['website'].get_client_action_url('/'), 'snippet_popup_and_scrollbar', login='admin')
         self.start_tour(self.env['website'].get_client_action_url('/'), 'snippet_popup_and_animations', login='admin', timeout=90)
 
+    def test_snippet_popup_with_scrollbar(self):
+        website = self.env.ref('website.default_website')
+        website.cookies_bar = True
+        self.start_tour(self.env['website'].get_client_action_url('/'), 'snippet_popup_and_scrollbar', login='admin')
+
     @unittest.skip
     def test_drag_and_drop_on_non_editable(self):
         self.start_tour(self.env['website'].get_client_action_url('/'), 'test_drag_and_drop_on_non_editable', login='admin')