From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- toolkit/components/captivedetect/test/unit/test_abort.js | 4 ++-- .../captivedetect/test/unit/test_abort_during_user_login.js | 2 +- .../components/captivedetect/test/unit/test_abort_ongoing_request.js | 4 ++-- .../components/captivedetect/test/unit/test_abort_pending_request.js | 4 ++-- .../components/captivedetect/test/unit/test_captive_portal_found.js | 4 ++-- .../captivedetect/test/unit/test_captive_portal_found_303.js | 4 ++-- .../captivedetect/test/unit/test_captive_portal_not_found.js | 2 +- .../captivedetect/test/unit/test_captive_portal_not_found_404.js | 2 +- toolkit/components/captivedetect/test/unit/test_multiple_requests.js | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'toolkit/components/captivedetect/test') diff --git a/toolkit/components/captivedetect/test/unit/test_abort.js b/toolkit/components/captivedetect/test/unit/test_abort.js index 0e0a944f9b..5cb649b4c0 100644 --- a/toolkit/components/captivedetect/test/unit/test_abort.js +++ b/toolkit/components/captivedetect/test/unit/test_abort.js @@ -21,7 +21,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { do_throw("should not receive captive-portal-login event"); } @@ -37,7 +37,7 @@ function test_abort() { Assert.equal(++step, 1); gCaptivePortalDetector.finishPreparation(kInterfaceName); }, - complete: function complete(success) { + complete: function complete() { do_throw("should not execute |complete| callback"); }, }; diff --git a/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js b/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js index bd0011817d..a933caee55 100644 --- a/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js +++ b/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js @@ -51,7 +51,7 @@ function test_abort() { Assert.equal(++step, 1); gCaptivePortalDetector.finishPreparation(kInterfaceName); }, - complete: function complete(success) { + complete: function complete() { do_throw("should not execute |complete| callback"); }, }; diff --git a/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js b/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js index b209e02796..187e27bc5d 100644 --- a/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js +++ b/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js @@ -22,7 +22,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { let xhr = new XMLHttpRequest(); xhr.open("GET", gServerURL + kCanonicalSitePath, true); @@ -42,7 +42,7 @@ function test_multiple_requests_abort() { Assert.equal(++step, 1); gCaptivePortalDetector.finishPreparation(kInterfaceName); }, - complete: function complete(success) { + complete: function complete() { do_throw("should not execute |complete| callback for " + kInterfaceName); }, }; diff --git a/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js b/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js index 16d621a06b..db6d37d904 100644 --- a/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js +++ b/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js @@ -22,7 +22,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { let xhr = new XMLHttpRequest(); xhr.open("GET", gServerURL + kCanonicalSitePath, true); @@ -56,7 +56,7 @@ function test_abort() { "should not execute |prepare| callback for " + kOtherInterfaceName ); }, - complete: function complete(success) { + complete: function complete() { do_throw("should not execute |complete| callback for " + kInterfaceName); }, }; diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js index 2a9acb8ab0..056bf072ee 100644 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js +++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js @@ -21,7 +21,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { let xhr = new XMLHttpRequest(); xhr.open("GET", gServerURL + kCanonicalSitePath, true); @@ -31,7 +31,7 @@ function fakeUIResponse() { } }, "captive-portal-login"); - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login-success") { Assert.equal(++step, 4); gServer.stop(do_test_finished); diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js index 1e4ec1f97d..deb80bc67c 100644 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js +++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js @@ -26,7 +26,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { let xhr = new XMLHttpRequest(); xhr.open("GET", gServerURL + kCanonicalSitePath, true); @@ -36,7 +36,7 @@ function fakeUIResponse() { } }, "captive-portal-login"); - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login-success") { Assert.equal(++step, 4); gServer.stop(function () { diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js index 25dd5f7c99..4f8c9615dc 100644 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js +++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js @@ -19,7 +19,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic == "captive-portal-login") { do_throw("should not receive captive-portal-login event"); } diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js index 3f9d212a1f..c6608f9548 100644 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js +++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js @@ -15,7 +15,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { do_throw("should not receive captive-portal-login event"); } diff --git a/toolkit/components/captivedetect/test/unit/test_multiple_requests.js b/toolkit/components/captivedetect/test/unit/test_multiple_requests.js index 7778a595b0..4b6d6511b2 100644 --- a/toolkit/components/captivedetect/test/unit/test_multiple_requests.js +++ b/toolkit/components/captivedetect/test/unit/test_multiple_requests.js @@ -23,7 +23,7 @@ function xhr_handler(metadata, response) { } function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login") { let xhr = new XMLHttpRequest(); xhr.open("GET", gServerURL + kCanonicalSitePath, true); @@ -33,7 +33,7 @@ function fakeUIResponse() { } }, "captive-portal-login"); - Services.obs.addObserver(function observe(subject, topic, data) { + Services.obs.addObserver(function observe(subject, topic) { if (topic === "captive-portal-login-success") { loginSuccessCount++; if (loginSuccessCount > 1) { -- cgit v1.2.3