From e030193e5fdf27703da5234015cb9cf65da525ee Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Mon, 19 Feb 2024 15:12:04 -0500
Subject: [PATCH] Tests/LibWeb: Move LibWeb test frames to their own directory

We currently have a handful of iframe tests whose sources are in the
"input" directory. This means they get run as their own tests, when they
are really just helper files. We've had to add empty test expectation
files for these "tests", and invoke a dummy test() method just to keep
the test runner happy.

Instead, move them to their own directory so the test runner does not
see them at all.
---
 .../Text/data/history-pushstate-iframe.html   | 15 ++++++++++++++
 .../Text/data/iframe-test-content-1.html      |  3 +++
 .../Text/data/iframe-test-content-2.html      |  3 +++
 .../navigation-navigate-iframe.html           | 11 +++-------
 .../navigation/history-pushstate-iframe.txt   |  0
 .../navigation/iframe-test-content-1.txt      |  0
 .../navigation/iframe-test-content-2.txt      |  0
 .../navigation/navigation-navigate-iframe.txt |  0
 .../navigation/history-pushstate-iframe.html  | 20 -------------------
 .../input/navigation/history-pushstate.html   |  4 ++--
 .../input/navigation/iframe-navigate-src.html |  4 ++--
 .../navigation/iframe-test-content-1.html     |  8 --------
 .../navigation/iframe-test-content-2.html     |  8 --------
 .../input/navigation/navigation-navigate.html |  4 ++--
 14 files changed, 30 insertions(+), 50 deletions(-)
 create mode 100644 Tests/LibWeb/Text/data/history-pushstate-iframe.html
 create mode 100644 Tests/LibWeb/Text/data/iframe-test-content-1.html
 create mode 100644 Tests/LibWeb/Text/data/iframe-test-content-2.html
 rename Tests/LibWeb/Text/{input/navigation => data}/navigation-navigate-iframe.html (94%)
 delete mode 100644 Tests/LibWeb/Text/expected/navigation/history-pushstate-iframe.txt
 delete mode 100644 Tests/LibWeb/Text/expected/navigation/iframe-test-content-1.txt
 delete mode 100644 Tests/LibWeb/Text/expected/navigation/iframe-test-content-2.txt
 delete mode 100644 Tests/LibWeb/Text/expected/navigation/navigation-navigate-iframe.txt
 delete mode 100644 Tests/LibWeb/Text/input/navigation/history-pushstate-iframe.html
 delete mode 100644 Tests/LibWeb/Text/input/navigation/iframe-test-content-1.html
 delete mode 100644 Tests/LibWeb/Text/input/navigation/iframe-test-content-2.html

diff --git a/Tests/LibWeb/Text/data/history-pushstate-iframe.html b/Tests/LibWeb/Text/data/history-pushstate-iframe.html
new file mode 100644
index 0000000000..1f227bb523
--- /dev/null
+++ b/Tests/LibWeb/Text/data/history-pushstate-iframe.html
@@ -0,0 +1,15 @@
+<script>
+    try {
+        const initialHistoryLength = window.history.length;
+
+        history.pushState({}, "hello", "history-pushstate-iframe.html#hello");
+
+        parent.postMessage(
+            "history object length has changed by " +
+                (window.history.length - initialHistoryLength),
+            "*"
+        );
+    } catch (e) {
+        parent.postMessage("ERROR:" + e, "*");
+    }
+</script>
diff --git a/Tests/LibWeb/Text/data/iframe-test-content-1.html b/Tests/LibWeb/Text/data/iframe-test-content-1.html
new file mode 100644
index 0000000000..77d9d10075
--- /dev/null
+++ b/Tests/LibWeb/Text/data/iframe-test-content-1.html
@@ -0,0 +1,3 @@
+<script>
+    parent.postMessage("message from test iframe (1)", "*");
+</script>
diff --git a/Tests/LibWeb/Text/data/iframe-test-content-2.html b/Tests/LibWeb/Text/data/iframe-test-content-2.html
new file mode 100644
index 0000000000..d651bcbb30
--- /dev/null
+++ b/Tests/LibWeb/Text/data/iframe-test-content-2.html
@@ -0,0 +1,3 @@
+<script>
+    parent.postMessage("message from test iframe (2)", "*");
+</script>
diff --git a/Tests/LibWeb/Text/input/navigation/navigation-navigate-iframe.html b/Tests/LibWeb/Text/data/navigation-navigate-iframe.html
similarity index 94%
rename from Tests/LibWeb/Text/input/navigation/navigation-navigate-iframe.html
rename to Tests/LibWeb/Text/data/navigation-navigate-iframe.html
index 30eee251a5..6bfcc11108 100644
--- a/Tests/LibWeb/Text/input/navigation/navigation-navigate-iframe.html
+++ b/Tests/LibWeb/Text/data/navigation-navigate-iframe.html
@@ -1,15 +1,10 @@
-<script src="../include.js"></script>
 <script>
     function filename(path) {
         url = new URL(path)
         return url.pathname.split('/').pop() + url.hash
     }
-    asyncTest(async done => {
-    if (window.self === window.top) {
-        test(() => {});
-        return;
-    }
 
+    (async () => {
     try {
         parent.postMessage(`Initial history length is ${navigation.entries().length}`, "*");
 
@@ -74,10 +69,10 @@
         // })
 
         // parent.postMessage(`History length after forward is ${navigation.entries().length}`, "*");
-        
+
     } catch (e) {
         parent.postMessage("ERROR:" + e, "*");
     }
     parent.postMessage("DONE", "*");
-    });
+    })();
 </script>
diff --git a/Tests/LibWeb/Text/expected/navigation/history-pushstate-iframe.txt b/Tests/LibWeb/Text/expected/navigation/history-pushstate-iframe.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Tests/LibWeb/Text/expected/navigation/iframe-test-content-1.txt b/Tests/LibWeb/Text/expected/navigation/iframe-test-content-1.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Tests/LibWeb/Text/expected/navigation/iframe-test-content-2.txt b/Tests/LibWeb/Text/expected/navigation/iframe-test-content-2.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Tests/LibWeb/Text/expected/navigation/navigation-navigate-iframe.txt b/Tests/LibWeb/Text/expected/navigation/navigation-navigate-iframe.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Tests/LibWeb/Text/input/navigation/history-pushstate-iframe.html b/Tests/LibWeb/Text/input/navigation/history-pushstate-iframe.html
deleted file mode 100644
index ae62b21d47..0000000000
--- a/Tests/LibWeb/Text/input/navigation/history-pushstate-iframe.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<script src="../include.js"></script>
-<script>
-    try {
-        const initialHistoryLength = window.history.length;
-
-        history.pushState({}, "hello", "history-pushstate-iframe.html#hello");
-
-        if (window.self !== window.top) {
-            parent.postMessage(
-                "history object length has changed by " +
-                    (window.history.length - initialHistoryLength),
-                "*"
-            );
-        } else {
-            test(() => {});
-        }
-    } catch (e) {
-        if (window.self !== window.top) parent.postMessage("ERROR:" + e, "*");
-    }
-</script>
diff --git a/Tests/LibWeb/Text/input/navigation/history-pushstate.html b/Tests/LibWeb/Text/input/navigation/history-pushstate.html
index 60a12d1654..4c09ff4548 100644
--- a/Tests/LibWeb/Text/input/navigation/history-pushstate.html
+++ b/Tests/LibWeb/Text/input/navigation/history-pushstate.html
@@ -18,6 +18,6 @@
             done();
         });
 
-        await navigateIframe("./history-pushstate-iframe.html");
-    }); 
+        await navigateIframe("../../data/history-pushstate-iframe.html");
+    });
 </script>
diff --git a/Tests/LibWeb/Text/input/navigation/iframe-navigate-src.html b/Tests/LibWeb/Text/input/navigation/iframe-navigate-src.html
index 0f0664b9f1..1248dfc4af 100644
--- a/Tests/LibWeb/Text/input/navigation/iframe-navigate-src.html
+++ b/Tests/LibWeb/Text/input/navigation/iframe-navigate-src.html
@@ -21,8 +21,8 @@
             }
         });
 
-        await navigateIframe("iframe-test-content-1.html");
-        await navigateIframe("iframe-test-content-2.html");
+        await navigateIframe("../../data/iframe-test-content-1.html");
+        await navigateIframe("../../data/iframe-test-content-2.html");
     });
 </script>
 <iframe id="testIframe" src="about:blank"></iframe>
diff --git a/Tests/LibWeb/Text/input/navigation/iframe-test-content-1.html b/Tests/LibWeb/Text/input/navigation/iframe-test-content-1.html
deleted file mode 100644
index 080d84daba..0000000000
--- a/Tests/LibWeb/Text/input/navigation/iframe-test-content-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script src="../include.js"></script>
-<script>
-    if (window.self !== window.top) {
-        parent.postMessage("message from test iframe (1)", "*");
-    } else {
-        test(() => {});
-    }
-</script>
diff --git a/Tests/LibWeb/Text/input/navigation/iframe-test-content-2.html b/Tests/LibWeb/Text/input/navigation/iframe-test-content-2.html
deleted file mode 100644
index 42694e6186..0000000000
--- a/Tests/LibWeb/Text/input/navigation/iframe-test-content-2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script src="../include.js"></script>
-<script>
-    if (window.self !== window.top) {
-        parent.postMessage("message from test iframe (2)", "*");
-    } else {
-        test(() => {});
-    }
-</script>
diff --git a/Tests/LibWeb/Text/input/navigation/navigation-navigate.html b/Tests/LibWeb/Text/input/navigation/navigation-navigate.html
index b478e54cef..ab0181d0a3 100644
--- a/Tests/LibWeb/Text/input/navigation/navigation-navigate.html
+++ b/Tests/LibWeb/Text/input/navigation/navigation-navigate.html
@@ -19,6 +19,6 @@
                 done();
         });
 
-        await navigateIframe("./navigation-navigate-iframe.html");
-    }); 
+        await navigateIframe("../../data/navigation-navigate-iframe.html");
+    });
 </script>