fixup

Author: kr8n3r

tests/pages/pages.py

@@ -306,41 +306,50 @@ class PageWithStickyNavMixin:
     def scrollToRevealElement(self, selector=None, xpath=None, stuckToBottom=True):
         module_path = '/assets/javascript/esm/stick-to-window-when-scrolling.mjs'
         js_module_var = "stickAtBottomWhenScrolling" if stuckToBottom else "stickAtTopWhenScrolling"
+        
+        # We pass the locator and the type as arguments to avoid quote collisions
+        locator = selector if selector else xpath
+        locator_type = 'selector' if selector else 'xpath'
 
-        element_finder = (
-            f"document.querySelector('{selector}')" if selector 
-            else f"document.evaluate('{xpath}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue"
-        )
-
-        # Check if the module is already initialized in window, if not, import it
-        # Then execute the specific handler
-        js_async_code = f"""
+        js_async_code = """
             var callback = arguments[arguments.length - 1];
-            
-            async function run() {{
-                try {{
-                    // Initialize module on window if not already present
-                    if (!window.__stickyNavModule) {{
-                        window.__stickyNavModule = await import('{module_path}');
-                    }}
+            var locator = arguments[0];
+            var type = arguments[1];
+            var moduleVar = arguments[2];
+            var modulePath = arguments[3];
+
+            async function run() {
+                try {
+                    if (!window.__stickyNavModule) {
+                        window.__stickyNavModule = await import(modulePath);
+                    }
                     
-                    const handler = window.__stickyNavModule.{js_module_var};
-                    const element = {element_finder};
+                    const handler = window.__stickyNavModule[moduleVar];
+                    let element;
                     
-                    if (element && handler) {{
+                    if (type === 'selector') {
+                        element = document.querySelector(locator);
+                    } else {
+                        element = document.evaluate(locator, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+                    }
+                    
+                    if (element && handler) {
                         handler.scrollToRevealElement(element);
                         callback(true);
-                    }} else {{
+                    } else {
                         callback(false);
-                    }}
-                }} catch (e) {{
+                    }
+                } catch (e) {
                     callback('Error: ' + e.message);
-                }}
-            }}
+                }
+            }
             run();
         """
 
-        result = self.driver.execute_async_script(js_async_code)
+        # Pass the variables separately. Selenium serializes them correctly.
+        result = self.driver.execute_async_script(
+            js_async_code, locator, locator_type, js_module_var, module_path
+        )
 
         if result is not True:
             raise Exception(f"Failed to scroll to element: {result}")