Revert "web: Work around webdriverio frame-switching bug with selectors"

This reverts commit 7ec4b7c.
ruffle-rs · Oct 28, 2024 · 9f989ab · 9f989ab
1 parent aaaea30
commit 9f989ab
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 64 deletions.
diff --git a/web/packages/selfhosted/test/polyfill/classic_frames_injected/test.ts b/web/packages/selfhosted/test/polyfill/classic_frames_injected/test.ts
@@ -1,9 +1,4 @@
-import {
-    openTest,
-    injectRuffleAndWait,
-    waitForRuffleObjectInTestFrame,
-    getContainerHTMLFromTestFrame,
-} from "../../utils.js";
+import { openTest, injectRuffleAndWait } from "../../utils.js";
 import { expect, use } from "chai";
 import chaiHtml from "chai-html";
 import fs from "fs";
@@ -17,10 +12,12 @@ describe("Flash inside frame with injected ruffle", () => {
 
     it("polyfills inside a frame", async () => {
         await injectRuffleAndWait(browser);
-        await browser.switchToFrame(await browser.$("#test-frame"));
-        await waitForRuffleObjectInTestFrame(browser);
+        await browser.switchFrame(await browser.$("#test-frame"));
+        await browser.$("<ruffle-object />").waitForExist();
 
-        const actual = await getContainerHTMLFromTestFrame(browser);
+        const actual = await browser
+            .$("#test-container")
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -35,16 +32,18 @@ describe("Flash inside frame with injected ruffle", () => {
         });
 
         // Then reload
-        await browser.switchToFrame(null);
-        await browser.switchToFrame(await browser.$("#nav-frame"));
+        await browser.switchFrame(null);
+        await browser.switchFrame(await browser.$("#nav-frame"));
         await browser.$("#reload-link").click();
 
         // And finally, check
-        await browser.switchToFrame(null);
-        await browser.switchToFrame(await browser.$("#test-frame"));
-        await waitForRuffleObjectInTestFrame(browser);
+        await browser.switchFrame(null);
+        await browser.switchFrame(await browser.$("#test-frame"));
+        await browser.$("<ruffle-object />").waitForExist();
 
-        const actual = await getContainerHTMLFromTestFrame(browser);
+        const actual = await browser
+            .$("#test-container")
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",

diff --git a/web/packages/selfhosted/test/polyfill/classic_frames_provided/test.ts b/web/packages/selfhosted/test/polyfill/classic_frames_provided/test.ts
@@ -1,8 +1,4 @@
-import {
-    openTest,
-    waitForRuffleObjectInTestFrame,
-    getContainerHTMLFromTestFrame,
-} from "../../utils.js";
+import { openTest } from "../../utils.js";
 import { expect, use } from "chai";
 import chaiHtml from "chai-html";
 import fs from "fs";
@@ -15,10 +11,12 @@ describe("Flash inside frame with provided ruffle", () => {
     });
 
     it("polyfills inside a frame", async () => {
-        await browser.switchToFrame(await browser.$("#test-frame"));
-        await waitForRuffleObjectInTestFrame(browser);
+        await browser.switchFrame(await browser.$("#test-frame"));
+        await browser.$("<ruffle-object />").waitForExist();
 
-        const actual = await getContainerHTMLFromTestFrame(browser);
+        const actual = await browser
+            .$("#test-container")
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -33,16 +31,18 @@ describe("Flash inside frame with provided ruffle", () => {
         });
 
         // Then reload
-        await browser.switchToFrame(null);
-        await browser.switchToFrame(await browser.$("#nav-frame"));
+        await browser.switchFrame(null);
+        await browser.switchFrame(await browser.$("#nav-frame"));
         await browser.$("#reload-link").click();
 
         // And finally, check
-        await browser.switchToFrame(null);
-        await browser.switchToFrame(await browser.$("#test-frame"));
-        await waitForRuffleObjectInTestFrame(browser);
+        await browser.switchFrame(null);
+        await browser.switchFrame(await browser.$("#test-frame"));
+        await browser.$("<ruffle-object />").waitForExist();
 
-        const actual = await getContainerHTMLFromTestFrame(browser);
+        const actual = await browser
+            .$("#test-container")
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",

diff --git a/web/packages/selfhosted/test/utils.ts b/web/packages/selfhosted/test/utils.ts
@@ -206,38 +206,3 @@ export function loadJsAPI(swf?: string) {
         }
     });
 }
-
-// TODO: After https://github.com/webdriverio/webdriverio/issues/13218 is fixed,
-// use `browser.$("<ruffle-object />").waitForExist()` at all call sites instead.
-export async function waitForRuffleObjectInTestFrame(
-    browser: WebdriverIO.Browser,
-) {
-    await browser
-        .$(
-            () =>
-                (
-                    document.querySelector("#test-frame") as
-                        | HTMLIFrameElement
-                        | HTMLFrameElement
-                ).contentDocument?.body.querySelector(
-                    "ruffle-object",
-                ) as HTMLElement,
-        )
-        .waitForExist();
-}
-
-// TODO: After https://github.com/webdriverio/webdriverio/issues/13218 is fixed, use
-// `browser.$("#test-container").getHTML({ includeSelectorTag: false, pierceShadowRoot: false })`
-// at all call sites instead.
-export async function getContainerHTMLFromTestFrame(
-    browser: WebdriverIO.Browser,
-) {
-    return await browser.execute(() => {
-        const el = (
-            document.querySelector("#test-frame") as
-                | HTMLIFrameElement
-                | HTMLFrameElement
-        ).contentDocument?.body.querySelector("#test-container");
-        return el?.innerHTML;
-    });
-}