From 8f8f790d1c395ab6a8af54a88d87b79bf83319ba Mon Sep 17 00:00:00 2001 From: Harveer Singh Date: Sun, 2 Nov 2025 14:18:28 +0000 Subject: [PATCH 1/2] Test changes. Differential Revision: https://phabricator.services.mozilla.com/D264457 bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1360870 gecko-commit: a14f11dd63a44406c565030f6ce95b1c1495d1ea gecko-reviewers: edenchuang, dom-worker-reviewers --- .../metadata/infrastructure/server/context.any.js.ini | 6 +++--- .../service-worker/resources/registration-tests-script.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructure/metadata/infrastructure/server/context.any.js.ini b/infrastructure/metadata/infrastructure/server/context.any.js.ini index b3964a632047f3..2c095124dda8af 100644 --- a/infrastructure/metadata/infrastructure/server/context.any.js.ini +++ b/infrastructure/metadata/infrastructure/server/context.any.js.ini @@ -4,9 +4,9 @@ if product == "epiphany" or product == "webkit": FAIL # https://bugs.webkit.org/show_bug.cgi?id=200815 [context.any.serviceworker-module.html] - expected: - if product == "firefox": ERROR - if product == "firefox_android": ERROR + [context] + expected: + if product == "epiphany" or product == "webkit": FAIL # https://bugs.webkit.org/show_bug.cgi?id=200815 [context.any.worker-module.html] diff --git a/service-workers/service-worker/resources/registration-tests-script.js b/service-workers/service-worker/resources/registration-tests-script.js index e5bdaf4291a420..a74cab8e3ace1f 100644 --- a/service-workers/service-worker/resources/registration-tests-script.js +++ b/service-workers/service-worker/resources/registration-tests-script.js @@ -30,21 +30,21 @@ function registration_tests_script(register_method, type) { promise_test(function(t) { var script = 'resources/malformed-worker.py?undefined-error'; - var scope = 'resources/scope/undefined-error'; + var scope = `resources/scope/undefined-error/${type}`; return promise_rejects_js(t, TypeError, register_method(script, {scope: scope}), 'Registration of script including undefined error should fail.'); - }, 'Registering script including undefined error'); + }, `Registering script including undefined error: ${type}`); promise_test(function(t) { var script = 'resources/malformed-worker.py?uncaught-exception'; - var scope = 'resources/scope/uncaught-exception'; + var scope = `resources/scope/uncaught-exception/${type}`; return promise_rejects_js(t, TypeError, register_method(script, {scope: scope}), 'Registration of script including uncaught exception should fail.'); - }, 'Registering script including uncaught exception'); + }, `Registering script including uncaught exception: ${type}`); if (type === 'classic') { promise_test(function(t) { From 80973656d6b25abc767b8a535a913e78ca44b23d Mon Sep 17 00:00:00 2001 From: Cristina Horotan Date: Mon, 3 Nov 2025 01:33:41 +0000 Subject: [PATCH 2/2] Revert "Bug 1360870, Bug 1989386, Bug 1990925, Bug 1995558: Test changes." for causing dt failures on browser_webconsole_json_mime.js This reverts commit 7604e737bedbc97a61ca19673e17f101c697524f. Revert "Bug 1995558: Service worker module registration should be rejected in case of any evaluation errors.r=edenchuang,dom-worker-reviewers" This reverts commit ac602ed98c71d8e61c58ed777adfac22a1780b5b. Revert "Bug 1990925: Module service workers should be able to load json modules.r=edenchuang,dom-worker-reviewers" This reverts commit dc6f670880a7ea777e9a1287c8926165299808ee. Revert "Bug 1989386: Correctly update serviceworker type on re-registration.r=edenchuang,dom-worker-reviewers" This reverts commit bd63d6b6d089285c01836514ca9a4066dd0d3468. Revert "Bug 1360870: on-disk schema changes to persist new serviceworker type parameter.r=edenchuang,dom-worker-reviewers" This reverts commit 9f740083c944b0a03ca5f6a0e4106eec31fb8583. Revert "Bug 1360870: Some source code plumbing and refactorings to support new serviceworker type.r=edenchuang,dom-worker-reviewers" This reverts commit e813c3de2fea2d819aaa5df4e71d49b81ccbd0fc. Revert "Bug 1360870: idl changes to support module service workers.r=asuth,edenchuang,webidl,smaug,dom-worker-reviewers" This reverts commit 2b4f2ed60e7c2105be7d000aabb227f1771e3308. gecko-commit: b8e7bea8aa25cdaa9c2959e5c859e658a82242d2 gecko-reviewers: edenchuang, dom-worker-reviewers --- .../metadata/infrastructure/server/context.any.js.ini | 6 +++--- .../service-worker/resources/registration-tests-script.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructure/metadata/infrastructure/server/context.any.js.ini b/infrastructure/metadata/infrastructure/server/context.any.js.ini index 2c095124dda8af..b3964a632047f3 100644 --- a/infrastructure/metadata/infrastructure/server/context.any.js.ini +++ b/infrastructure/metadata/infrastructure/server/context.any.js.ini @@ -4,9 +4,9 @@ if product == "epiphany" or product == "webkit": FAIL # https://bugs.webkit.org/show_bug.cgi?id=200815 [context.any.serviceworker-module.html] - [context] - expected: - if product == "epiphany" or product == "webkit": FAIL # https://bugs.webkit.org/show_bug.cgi?id=200815 + expected: + if product == "firefox": ERROR + if product == "firefox_android": ERROR [context.any.worker-module.html] diff --git a/service-workers/service-worker/resources/registration-tests-script.js b/service-workers/service-worker/resources/registration-tests-script.js index a74cab8e3ace1f..e5bdaf4291a420 100644 --- a/service-workers/service-worker/resources/registration-tests-script.js +++ b/service-workers/service-worker/resources/registration-tests-script.js @@ -30,21 +30,21 @@ function registration_tests_script(register_method, type) { promise_test(function(t) { var script = 'resources/malformed-worker.py?undefined-error'; - var scope = `resources/scope/undefined-error/${type}`; + var scope = 'resources/scope/undefined-error'; return promise_rejects_js(t, TypeError, register_method(script, {scope: scope}), 'Registration of script including undefined error should fail.'); - }, `Registering script including undefined error: ${type}`); + }, 'Registering script including undefined error'); promise_test(function(t) { var script = 'resources/malformed-worker.py?uncaught-exception'; - var scope = `resources/scope/uncaught-exception/${type}`; + var scope = 'resources/scope/uncaught-exception'; return promise_rejects_js(t, TypeError, register_method(script, {scope: scope}), 'Registration of script including uncaught exception should fail.'); - }, `Registering script including uncaught exception: ${type}`); + }, 'Registering script including uncaught exception'); if (type === 'classic') { promise_test(function(t) {