chore: Conform with new type definitions for WebDriverIO execute method

Author: danielhjacobs

web/packages/selfhosted/test/integration_tests/context_menu_position/test.ts

@@ -15,12 +15,10 @@ async function setDirection(
     direction: string,
 ) {
     await browser.execute(
-        (element, direction) => {
-            const el = element as unknown as HTMLElement;
-            el.dir = direction;
+        ({ el, dir }: { el: HTMLElement; dir: string }) => {
+            el.dir = dir;
         },
-        element,
-        direction,
+        { el: element, dir: direction },
     );
 }
 

web/packages/selfhosted/test/integration_tests/external_interface/test.ts

@@ -23,39 +23,36 @@ interface RuffleTest {
 }
 
 declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace WebdriverIO {
-        interface Element {
-            // ExternalInterface makes whatever functions exist "magically" - so let's just declare here for type's sake
+    interface HTMLElement {
+        // ExternalInterface makes whatever functions exist "magically" - so let's just declare here for type's sake
 
-            // Logs all arguments to trace
-            log: (...args: unknown[]) => void;
+        // Logs all arguments to trace
+        log: (...args: unknown[]) => void;
 
-            // Calls `ExternalInterface.call(name, ...args)` after a delay (to avoid reentrancy)
-            callMethodWithDelay: (name: string, ...args: unknown[]) => void;
+        // Calls `ExternalInterface.call(name, ...args)` after a delay (to avoid reentrancy)
+        callMethodWithDelay: (name: string, ...args: unknown[]) => void;
 
-            // Calls `ExternalInterface.call(name, ...args)` immediately (causing reentrancy)
-            callMethodImmediately: (name: string, ...args: unknown[]) => void;
+        // Calls `ExternalInterface.call(name, ...args)` immediately (causing reentrancy)
+        callMethodImmediately: (name: string, ...args: unknown[]) => void;
 
-            // Returns `value`
-            returnAValue: <T>(value: T) => T;
+        // Returns `value`
+        returnAValue: <T>(value: T) => T;
 
-            // Should return an exception...
-            throwAnException: () => void;
+        // Should return an exception...
+        throwAnException: () => void;
 
-            // Calls `ExternalInterface.marshallExceptions = value`
-            setMarshallExceptions: (value: boolean) => void;
+        // Calls `ExternalInterface.marshallExceptions = value`
+        setMarshallExceptions: (value: boolean) => void;
 
-            // Calls `ExternalInterface.addCallback(name, function() { return returnValue; })`
-            addAnotherCallback: (name: string, returnValue: unknown) => void;
+        // Calls `ExternalInterface.addCallback(name, function() { return returnValue; })`
+        addAnotherCallback: (name: string, returnValue: unknown) => void;
 
-            // Going to be redefined as part of a test
-            redefinedMethod: () => string;
+        // Going to be redefined as part of a test
+        redefinedMethod: () => string;
 
-            ruffle<V extends keyof Player.APIVersions = 1>(
-                version?: V,
-            ): Player.APIVersions[V];
-        }
+        ruffle<V extends keyof Player.APIVersions = 1>(
+            version?: V,
+        ): Player.APIVersions[V];
     }
 
     interface Window {
@@ -102,11 +99,9 @@ ExternalInterface.objectID: "flash_name"
                     return called;
                 },
                 log: function (...args: any[]) {
-                    (
-                        document.getElementById(
-                            "flash_id",
-                        ) as unknown as WebdriverIO.Element
-                    ).log(...args);
+                    (document.getElementById("flash_id") as HTMLElement).log(
+                        ...args,
+                    );
                 },
             };
         });

web/packages/selfhosted/test/utils.ts

@@ -213,15 +213,15 @@ export async function closeAllModals(
     browser: WebdriverIO.Browser,
     player: ChainablePromiseElement,
 ) {
+    const modals = await player.$$(".modal:not(.hidden)");
     await browser.execute(
-        (modals) => {
-            for (const modal of modals) {
-                const m = modal as unknown as HTMLElement;
+        ({ modals }) => {
+            for (const m of modals) {
                 const cl = m.querySelector(".close-modal")! as HTMLElement;
                 cl.click();
             }
         },
-        await player.$$(".modal:not(.hidden)"),
+        { modals },
     );
 }