Bug 1899331 - Rename workers in toolkit to use the ESLint pattern. r=frontend-codestyle-reviewers,Gijs

Differential Revision: https://phabricator.services.mozilla.com/D211889

toolkit/components/ctypes/tests/chrome/chrome.toml

@@ -2,7 +2,7 @@
 skip-if = ["os == 'android'"]
 support-files = [
   "xpcshellTestHarnessAdaptor.js",
-  "ctypes_worker.js",
+  "ctypes.worker.js",
   "../unit/test_jsctypes.js",
 ]
 

toolkit/components/ctypes/tests/chrome/ctypes.worker.js

@@ -3,8 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* eslint-env worker */
-
 importScripts("xpcshellTestHarnessAdaptor.js");
 
 onmessage = function (event) {

toolkit/components/ctypes/tests/chrome/test_ctypes.xhtml

@@ -77,7 +77,7 @@
       ok(dir.exists() && dir.isDirectory(), "Chrome test dir doesn't exist?!");
       setupLibs(dir);
 
-      var worker = new ChromeWorker("ctypes_worker.js");
+      var worker = new ChromeWorker("ctypes.worker.js");
       worker.onmessage = function(event) {
         is(event.data, "Done!", "Wrong message!");
         cleanupLibs(dir);

toolkit/components/extensions/test/mochitest/chrome.toml

@@ -7,7 +7,7 @@ support-files = [
   "file_image_great.png",
   "file_sample.html",
   "file_with_images.html",
-  "webrequest_chromeworker.js",
+  "webrequest_chrome.worker.js",
   "webrequest_test.sys.mjs",
 ]
 prefs = ["security.mixed_content.upgrade_display_content=false"]

toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_background_events.html

@@ -57,7 +57,7 @@ add_task(async function test_webRequest_chromeworker_events() {
   let extension = ExtensionTestUtils.loadExtension(testExtension);
   await extension.startup();
   await new Promise(resolve => {
-    let worker = new ChromeWorker("webrequest_chromeworker.js");
+    let worker = new ChromeWorker("webrequest_chrome.worker.js");
     worker.onmessage = () => {
       ok("chrome worker fetch finished");
       resolve();

toolkit/components/extensions/test/mochitest/webrequest_chrome.worker.js

@@ -1,7 +1,5 @@
 "use strict";
 
-/* eslint-env worker */
-
 onmessage = function () {
   fetch("https://example.com/example.txt").then(() => {
     postMessage("Done!");

toolkit/components/promiseworker/tests/xpcshell/data/worker.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/* eslint-env worker */
-
 "use strict";
 
 // Trivial worker definition

toolkit/components/url-classifier/tests/mochitest/chrome.toml

@@ -15,19 +15,19 @@ support-files = [
   "threathit.sjs",
   "redirect_tracker.sjs",
   "!/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html",
-  "!/toolkit/components/url-classifier/tests/mochitest/cleanWorker.js",
+  "!/toolkit/components/url-classifier/tests/mochitest/clean.worker.js",
   "!/toolkit/components/url-classifier/tests/mochitest/good.js",
   "!/toolkit/components/url-classifier/tests/mochitest/evil.css",
   "!/toolkit/components/url-classifier/tests/mochitest/evil.css^headers^",
   "!/toolkit/components/url-classifier/tests/mochitest/evil.js",
   "!/toolkit/components/url-classifier/tests/mochitest/evil.js^headers^",
-  "!/toolkit/components/url-classifier/tests/mochitest/evilWorker.js",
+  "!/toolkit/components/url-classifier/tests/mochitest/evil.worker.js",
   "!/toolkit/components/url-classifier/tests/mochitest/import.css",
   "!/toolkit/components/url-classifier/tests/mochitest/raptor.jpg",
   "!/toolkit/components/url-classifier/tests/mochitest/track.html",
   "!/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js",
   "!/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js^headers^",
-  "!/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js",
+  "!/toolkit/components/url-classifier/tests/mochitest/unwanted.worker.js",
   "!/toolkit/components/url-classifier/tests/mochitest/vp9.webm",
   "!/toolkit/components/url-classifier/tests/mochitest/whitelistFrame.html",
   "!/toolkit/components/url-classifier/tests/mochitest/workerFrame.html",

toolkit/components/url-classifier/tests/mochitest/clean.worker.js

@@ -1,8 +1,6 @@
-/* eslint-env worker */
-
 onmessage = function () {
   try {
-    importScripts("evilWorker.js");
+    importScripts("evil.worker.js");
   } catch (ex) {
     postMessage("success");
     return;

toolkit/components/url-classifier/tests/mochitest/evil.worker.js

@@ -1,5 +1,3 @@
-/* eslint-env worker */
-
 onmessage = function () {
   postMessage("loaded bad file");
 };

toolkit/components/url-classifier/tests/mochitest/mochitest.toml

@@ -4,14 +4,14 @@ support-files = [
   "classifierCommon.js",
   "classifierFrame.html",
   "classifierHelper.js",
-  "cleanWorker.js",
+  "clean.worker.js",
   "good.js",
   "head.js",
   "evil.css",
   "evil.css^headers^",
   "evil.js",
   "evil.js^headers^",
-  "evilWorker.js",
+  "evil.worker.js",
   "import.css",
   "import2.css",
   "raptor.jpg",
@@ -20,7 +20,7 @@ support-files = [
   "trackerFrame.sjs",
   "trackingRequest.js",
   "trackingRequest.js^headers^",
-  "unwantedWorker.js",
+  "unwanted.worker.js",
   "vp9.webm",
   "whitelistFrame.html",
   "workerFrame.html",

toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html

@@ -15,10 +15,10 @@
 <script class="testbody" type="text/javascript">
 // Add some URLs to the malware database.
 var testData = [
-  { url: "example.com/tests/toolkit/components/url-classifier/tests/mochitest/evilWorker.js",
+  { url: "example.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.worker.js",
     db: "test-malware-simple",
   },
-  { url: "example.com/tests/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js",
+  { url: "example.com/tests/toolkit/components/url-classifier/tests/mochitest/unwanted.worker.js",
     db: "test-unwanted-simple",
   },
 ];

toolkit/components/url-classifier/tests/mochitest/unwanted.worker.js

@@ -1,5 +1,3 @@
-/* eslint-env worker */
-
 onmessage = function () {
   postMessage("loaded bad file");
 };

toolkit/components/url-classifier/tests/mochitest/workerFrame.html

@@ -5,19 +5,19 @@
 <script type="text/javascript">
 
 function startCleanWorker() {
-  var worker = new Worker("cleanWorker.js");
+  var worker = new Worker("clean.worker.js");
 
   worker.onmessage = function(event) {
     if (event.data == "success") {
-      window.parent.postMessage("success:blocked importScripts('evilWorker.js')", "*");
+      window.parent.postMessage("success:blocked importScripts('evil.worker.js')", "*");
     } else {
-      window.parent.postMessage("failure:failed to block importScripts('evilWorker.js')", "*");
+      window.parent.postMessage("failure:failed to block importScripts('evil.worker.js')", "*");
     }
     window.parent.postMessage("finish", "*");
   };
 
   worker.onerror = function() {
-    window.parent.postmessage("failure:failed to load cleanWorker.js", "*");
+    window.parent.postmessage("failure:failed to load clean.worker.js", "*");
     window.parent.postMessage("finish", "*");
   };
 
@@ -25,15 +25,15 @@ function startCleanWorker() {
 }
 
 function startEvilWorker() {
-  var worker = new Worker("evilWorker.js");
+  var worker = new Worker("evil.worker.js");
 
   worker.onmessage = function() {
-    window.parent.postMessage("failure:failed to block evilWorker.js", "*");
+    window.parent.postMessage("failure:failed to block evil.worker.js", "*");
     startUnwantedWorker();
   };
 
   worker.onerror = function() {
-    window.parent.postMessage("success:blocked evilWorker.js", "*");
+    window.parent.postMessage("success:blocked evil.worker.js", "*");
     startUnwantedWorker();
   };
 
@@ -41,15 +41,15 @@ function startEvilWorker() {
 }
 
 function startUnwantedWorker() {
-  var worker = new Worker("unwantedWorker.js");
+  var worker = new Worker("unwanted.worker.js");
 
   worker.onmessage = function() {
-    window.parent.postMessage("failure:failed to block unwantedWorker.js", "*");
+    window.parent.postMessage("failure:failed to block unwanted.worker.js", "*");
     startCleanWorker();
   };
 
   worker.onerror = function() {
-    window.parent.postMessage("success:blocked unwantedWorker.js", "*");
+    window.parent.postMessage("success:blocked unwanted.worker.js", "*");
     startCleanWorker();
   };
 

toolkit/components/workerloader/tests/chrome.toml

@@ -10,9 +10,9 @@ support-files = [
   "moduleH-module-dot-exports.js",
   "moduleI-depends.js",
   "moduleJ-dependency.js",
+  "test_loading.worker.js",
   "utils_mainthread.js",
   "utils_worker.js",
-  "worker_test_loading.js",
 ]
 
 ["test_loading.xhtml"]

toolkit/components/workerloader/tests/test_loading.worker.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/* eslint-env worker */
-
 "use strict";
 
 importScripts("utils_worker.js"); // Test suite code

toolkit/components/workerloader/tests/test_loading.xhtml

@@ -20,7 +20,7 @@ let main = this;
 function test() {
   info("Starting test " + document.uri);
 
-  worker = new ChromeWorker("worker_test_loading.js");
+  worker = new ChromeWorker("test_loading.worker.js");
   SimpleTest.waitForExplicitFinish();
   info("Chrome worker created");
   worker_handler(worker);