Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
author: Daniel Baumann <daniel.baumann@progress-linux.org> 2024-04-19 01:14:29 +0000
committer: Daniel Baumann <daniel.baumann@progress-linux.org> 2024-04-19 01:14:29 +0000
commit: fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree: 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /docshell/test/mochitest
parent: Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
download: firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz
firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip
13 files changed, 14 insertions, 85 deletions
diff --git a/docshell/test/mochitest/clicker.html b/docshell/test/mochitest/clicker.html
index b655e27ea5..476741e649 100644
--- a/docshell/test/mochitest/clicker.html
+++ b/docshell/test/mochitest/clicker.html
@@ -3,5 +3,5 @@
   "use strict";
   let target = window.opener ? window.opener : window.parent;
 
-  onmessage = ({data}) => target.postMessage({}, "*");
+  onmessage = () => target.postMessage({}, "*");
 </script>
diff --git a/docshell/test/mochitest/double_submit.sjs b/docshell/test/mochitest/double_submit.sjs
index 4ca088173c..edbb92a613 100644
--- a/docshell/test/mochitest/double_submit.sjs
+++ b/docshell/test/mochitest/double_submit.sjs
@@ -13,7 +13,7 @@ const BinaryInputStream = CC(
   "setInputStream"
 );
 
-function log(str) {
+function log() {
   //  dump(`LOG: ${str}\n`);
 }
 
diff --git a/docshell/test/mochitest/file_bug1850335_1.html b/docshell/test/mochitest/file_bug1850335_1.html
index f317d2197a..09aa7a42cf 100644
--- a/docshell/test/mochitest/file_bug1850335_1.html
+++ b/docshell/test/mochitest/file_bug1850335_1.html
@@ -1,5 +1,5 @@
 <script>
-addEventListener("load", ({ persisted }) => {
+addEventListener("load", () => {
   document.getElementById("input1").value = "";
 });
 addEventListener("pageshow", ({ persisted }) => {
diff --git a/docshell/test/mochitest/file_bug511449.html b/docshell/test/mochitest/file_bug511449.html
deleted file mode 100644
index 637732dbbf..0000000000
--- a/docshell/test/mochitest/file_bug511449.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML>
-<title>Used in test for bug 511449</title>
-<input type="text" id="input">
-<script type="text/javascript">
-  document.getElementById("input").focus();
-</script>
diff --git a/docshell/test/mochitest/file_content_javascript_loads_root.html b/docshell/test/mochitest/file_content_javascript_loads_root.html
index b9f2c1faa7..8475ee979c 100644
--- a/docshell/test/mochitest/file_content_javascript_loads_root.html
+++ b/docshell/test/mochitest/file_content_javascript_loads_root.html
@@ -10,7 +10,7 @@ window.onload = () => {
 };
 
 // eslint-disable-next-line no-shadow
-function promiseMessage(source, filter = event => true) {
+function promiseMessage(source, filter = () => true) {
   return new Promise(resolve => {
     function listener(event) {
       if (event.source == source && filter(event)) {
diff --git a/docshell/test/mochitest/form_submit.sjs b/docshell/test/mochitest/form_submit.sjs
index 1a1fa5d89c..cb6bb9e60f 100644
--- a/docshell/test/mochitest/form_submit.sjs
+++ b/docshell/test/mochitest/form_submit.sjs
@@ -13,7 +13,7 @@ const BinaryOutputStream = CC(
   "setOutputStream"
 );
 
-function log(str) {
+function log() {
   // dump(`LOG: ${str}\n`);
 }
 
diff --git a/docshell/test/mochitest/historyframes.html b/docshell/test/mochitest/historyframes.html
index 31f46a5071..da9c3a0936 100644
--- a/docshell/test/mochitest/historyframes.html
+++ b/docshell/test/mochitest/historyframes.html
@@ -112,7 +112,7 @@ function* test_state_navigation() {
   is(getURL(), URL2, "URL should be correct");
   is(getContent(), "Test2", "Page should be correct");
 
-  window.addEventListener("popstate", (e) => {
+  window.addEventListener("popstate", () => {
     continueAsync();
   }, {once: true});
   window.history.back();
@@ -122,7 +122,7 @@ function* test_state_navigation() {
   is(getURL(), URL2, "URL should be correct");
   is(getContent(), "Test2", "Page should be correct");
 
-  window.addEventListener("popstate", (e) => {
+  window.addEventListener("popstate", () => {
     continueAsync();
   }, {once: true});
   window.history.forward();
@@ -132,13 +132,13 @@ function* test_state_navigation() {
   is(getURL(), URL2, "URL should be correct");
   is(getContent(), "Test2", "Page should be correct");
 
-  window.addEventListener("popstate", (e) => {
+  window.addEventListener("popstate", () => {
     continueAsync();
   }, {once: true});
   window.history.back();
   yield;
 
-  window.addEventListener("popstate", (e) => {
+  window.addEventListener("popstate", () => {
     continueAsync();
   }, {once: true});
   window.history.back();
diff --git a/docshell/test/mochitest/mochitest.toml b/docshell/test/mochitest/mochitest.toml
index 8d593c9e36..93c1d1f9b1 100644
--- a/docshell/test/mochitest/mochitest.toml
+++ b/docshell/test/mochitest/mochitest.toml
@@ -78,15 +78,6 @@ skip-if = ["true"] # Disabled for too many intermittent failures (bug 719186)
 
 ["test_bug509055.html"]
 
-["test_bug511449.html"]
-skip-if = [
-  "os == 'win'",
-  "os == 'linux'",
-  "os == 'android'",
-  "headless", # Headless: bug 1410525
-]
-support-files = ["file_bug511449.html"]
-
 ["test_bug529119-1.html"]
 
 ["test_bug529119-2.html"]
diff --git a/docshell/test/mochitest/test_bug509055.html b/docshell/test/mochitest/test_bug509055.html
index 57ede19b43..9954866fa1 100644
--- a/docshell/test/mochitest/test_bug509055.html
+++ b/docshell/test/mochitest/test_bug509055.html
@@ -28,14 +28,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=509055
       setTimeout(function() { gGen.next(); }, 0, false);
     }
 
-    function onChildHashchange(e) {
+    function onChildHashchange() {
       // gGen might be undefined when we refresh the page, so we have to check here
       dump("onChildHashchange() called.\n");
       if (gGen)
         gGen.next();
     }
 
-    function onChildLoad(e) {
+    function onChildLoad() {
       if (gGen)
         gGen.next();
     }
diff --git a/docshell/test/mochitest/test_bug511449.html b/docshell/test/mochitest/test_bug511449.html
deleted file mode 100644
index da95909d1c..0000000000
--- a/docshell/test/mochitest/test_bug511449.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=511449
--->
-<head>
-  <title>Test for Bug 511449</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script src="/tests/SimpleTest/NativeKeyCodes.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=511449">Mozilla Bug 511449</a>
-<p id="display"></p>
-<div id="status"></div>
-<div id="content">
-</div>
-<input type="text" id="input">
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 511449 */
-
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-window.addEventListener("load", runTest);
-
-var win = null;
-
-function runTest() {
-  document.getElementById("input").focus();
-  win = window.open("file_bug511449.html", "");
-  SimpleTest.waitForFocus(runNextTest, win);
-}
-
-function runNextTest() {
-  var didClose = false;
-  win.onunload = function() {
-    didClose = true;
-  };
-  synthesizeNativeKey(KEYBOARD_LAYOUT_EN_US, MAC_VK_ANSI_W, {metaKey: 1}, "w", "w");
-
-  setTimeout(function() {
-    ok(didClose, "Cmd+W should have closed the tab");
-    if (!didClose) {
-      win.close();
-    }
-    SimpleTest.finish();
-  }, 1000);
-}
-
-</script>
-
-</body>
-</html>
diff --git a/docshell/test/mochitest/test_bug529119-1.html b/docshell/test/mochitest/test_bug529119-1.html
index 1c89780fc7..7a7098a0c8 100644
--- a/docshell/test/mochitest/test_bug529119-1.html
+++ b/docshell/test/mochitest/test_bug529119-1.html
@@ -28,7 +28,7 @@ async function assignToken(tokenToAssign) {
                             newToken => { this.content.token = newToken });
 }
 
-async function pollForPage(win) {
+async function pollForPage() {
   while (true) {
     try {
       // When we do our navigation, there may be an interstitial about:blank
diff --git a/docshell/test/mochitest/test_bug680257.html b/docshell/test/mochitest/test_bug680257.html
index 4d5736ac0a..3c9b339550 100644
--- a/docshell/test/mochitest/test_bug680257.html
+++ b/docshell/test/mochitest/test_bug680257.html
@@ -20,7 +20,7 @@ var popup = window.open("file_bug680257.html");
 var gTestContinuation = null;
 function continueAsync() {
   popup.addEventListener("hashchange",
-    function(e) { gTestContinuation.next(); }, { once: true });
+    function() { gTestContinuation.next(); }, { once: true });
 }
 
 // The popup will call into popupLoaded() once it loads.
diff --git a/docshell/test/mochitest/test_content_javascript_loads.html b/docshell/test/mochitest/test_content_javascript_loads.html
index eabc1d314e..d82cdf35aa 100644
--- a/docshell/test/mochitest/test_content_javascript_loads.html
+++ b/docshell/test/mochitest/test_content_javascript_loads.html
@@ -13,7 +13,7 @@
 <script type="application/javascript">
 "use strict";
 
-function promiseMessage(source, filter = event => true) {
+function promiseMessage(source, filter = () => true) {
   return new Promise(resolve => {
     function listener(event) {
       if (event.source == source && filter(event)) {
author	Daniel Baumann <daniel.baumann@progress-linux.org>	2024-04-19 01:14:29 +0000
committer	Daniel Baumann <daniel.baumann@progress-linux.org>	2024-04-19 01:14:29 +0000
commit	fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree	4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /docshell/test/mochitest
parent	Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
download	firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip