Revert "Bug 1360870, Bug 1995558, Bug 1990925, Bug 1989386: Test changes." for causing failures at browser_dbg-browser-toolbox-workers.js.

This reverts commit 5308d85d1342b4ce4721100a319bec1cd2d03ef0.

Revert "Bug 1995558: Service worker module registration should be rejected in case of any evaluation errors.r=edenchuang,dom-worker-reviewers"

This reverts commit 262e9c7f2213b5884baaeea39cd01e12041337f3.

Revert "Bug 1990925: Module service workers should be able to load json modules.r=edenchuang,dom-worker-reviewers"

This reverts commit 5e00fd86aaa0f57938bdc58e57daaaae80995a2f.

Revert "Bug 1989386: Correctly update serviceworker type on re-registration.r=edenchuang,dom-worker-reviewers"

This reverts commit 137e22f4402eb7939b30724ca7271664f59a1ed0.

Revert "Bug 1360870: on-disk schema changes to persist new serviceworker type parameter.r=edenchuang,dom-worker-reviewers"

This reverts commit bf551670f43fd2576802584a37bd4d66cb6eee7f.

Revert "Bug 1360870: Some source code plumbing and refactorings to support new serviceworker type.r=edenchuang,dom-worker-reviewers"

This reverts commit 040663a23b2fd939acff1c4bb1cf1a86519221ee.

Revert "Bug 1360870: idl changes to support module service workers.r=asuth,edenchuang,webidl,smaug,dom-worker-reviewers"

This reverts commit c8854f0a27252c5a22df63ffee8d8efb327f6e9c.

gecko-commit: 254ce923c1e5e7c8c431340e57520f419c104d2d
gecko-reviewers: edenchuang, dom-worker-reviewers

Author: Atila Butkovits

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]
 

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) {