From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../testdriver/minimize_restore_popup.html.ini     |  2 +
 .../test_win_open_with_interaction.html.ini        |  5 ---
 .../testdriver/minimize_restore_popup.html         | 44 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/minimize_restore_popup.html.ini
 delete mode 100644 testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/test_win_open_with_interaction.html.ini
 create mode 100644 testing/web-platform/tests/infrastructure/testdriver/minimize_restore_popup.html

(limited to 'testing/web-platform/tests/infrastructure')
diff --git a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/minimize_restore_popup.html.ini b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/minimize_restore_popup.html.ini
new file mode 100644
index 0000000000..6075b58d09
--- /dev/null
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/minimize_restore_popup.html.ini
@@ -0,0 +1,2 @@
+[minimize_restore_popup.html]
+  disabled: https://github.com/web-platform-tests/wpt/issues/45137
diff --git a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/test_win_open_with_interaction.html.ini b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/test_win_open_with_interaction.html.ini
deleted file mode 100644
index b1e77bd8e5..0000000000
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/test_win_open_with_interaction.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_win_open_with_interaction.html]
-  expected: [OK, TIMEOUT]
-
-  [Tests pointer move/click in a window opened with `window.open.`]
-    expected: [FAIL, TIMEOUT, PASS]
diff --git a/testing/web-platform/tests/infrastructure/testdriver/minimize_restore_popup.html b/testing/web-platform/tests/infrastructure/testdriver/minimize_restore_popup.html
new file mode 100644
index 0000000000..99245083b5
--- /dev/null
+++ b/testing/web-platform/tests/infrastructure/testdriver/minimize_restore_popup.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver minimize/restore method in popup</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script>
+const params = new URLSearchParams(location.search);
+const is_popup_page = params.has('popup');
+const channel = new BroadcastChannel("testchannel");
+
+if (is_popup_page) {
+    onload = async () => {
+        window.opener.events.push(document.visibilityState);
+        let rect = await test_driver.minimize_window();
+        window.opener.events.push(document.visibilityState);
+        await test_driver.set_window_rect(rect);
+        window.opener.events.push(document.visibilityState);
+        channel.postMessage("done");
+    };
+} else {
+    promise_test(async t => {
+        let popup;
+        onload = () => {
+          window.events = [];
+          popup = window.open("?popup");
+        };
+
+        await new Promise(resolve => {
+          channel.addEventListener(
+            "message", t.step_func(async (e) => {
+              if (e.data === "done") {
+                const expectedEvents = ["visible", "hidden", "visible"];
+                assert_array_equals(window.events, expectedEvents, 'incorrect event order');
+                popup.close();
+                resolve();
+              }
+          }));
+        });
+  }, `minimize and restore on popup`);
+}
+</script>
-- 
cgit v1.2.3

