Bug 1701790 - Move ResourceWatcher tests to their new folder. r=nchevobbe

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

devtools/shared/commands/resource/tests/browser_resources_network_event_stacktraces.js

@@ -13,7 +13,7 @@ const REQUEST_STUB = {
     stacktraceAvailable: true,
     lastFrame: {
       filename:
-        "https://example.com/browser/devtools/shared/resources/tests/network_document.html",
+        "https://example.com/browser/devtools/shared/commands/resource/tests/network_document.html",
       lineNumber: 1,
       columnNumber: 40,
       functionName: "triggerRequest",

devtools/shared/commands/resource/tests/browser_resources_sources.js

@@ -44,9 +44,9 @@ add_task(async function() {
       sourceForm: {
         introductionType: "scriptElement",
         sourceMapBaseURL:
-          "https://example.com/browser/devtools/shared/resources/tests/sources.js",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/sources.js",
         url:
-          "https://example.com/browser/devtools/shared/resources/tests/sources.js",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/sources.js",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,
@@ -61,7 +61,7 @@ add_task(async function() {
       sourceForm: {
         introductionType: "eval",
         sourceMapBaseURL:
-          "https://example.com/browser/devtools/shared/resources/tests/sources.html",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/sources.html",
         url: null,
         isBlackBoxed: false,
         sourceMapURL: null,
@@ -77,9 +77,9 @@ add_task(async function() {
       sourceForm: {
         introductionType: "scriptElement",
         sourceMapBaseURL:
-          "https://example.com/browser/devtools/shared/resources/tests/sources.html",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/sources.html",
         url:
-          "https://example.com/browser/devtools/shared/resources/tests/sources.html",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/sources.html",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,
@@ -94,9 +94,9 @@ add_task(async function() {
       sourceForm: {
         introductionType: undefined,
         sourceMapBaseURL:
-          "https://example.com/browser/devtools/shared/resources/tests/worker-sources.js",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/worker-sources.js",
         url:
-          "https://example.com/browser/devtools/shared/resources/tests/worker-sources.js",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/worker-sources.js",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,
@@ -111,9 +111,9 @@ add_task(async function() {
       sourceForm: {
         introductionType: undefined,
         sourceMapBaseURL:
-          "https://example.com/browser/devtools/shared/resources/tests/service-worker-sources.js",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/service-worker-sources.js",
         url:
-          "https://example.com/browser/devtools/shared/resources/tests/service-worker-sources.js",
+          "https://example.com/browser/devtools/shared/commands/resource/tests/service-worker-sources.js",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,

devtools/shared/commands/resource/tests/browser_resources_stylesheets.js

@@ -14,7 +14,7 @@ const EXISTING_RESOURCES = [
     styleText: "body { color: lime; }",
     href: null,
     nodeHref:
-      "https://example.com/browser/devtools/shared/resources/tests/style_document.html",
+      "https://example.com/browser/devtools/shared/commands/resource/tests/style_document.html",
     isNew: false,
     disabled: false,
     ruleCount: 1,
@@ -23,9 +23,9 @@ const EXISTING_RESOURCES = [
   {
     styleText: "body { margin: 1px; }",
     href:
-      "https://example.com/browser/devtools/shared/resources/tests/style_document.css",
+      "https://example.com/browser/devtools/shared/commands/resource/tests/style_document.css",
     nodeHref:
-      "https://example.com/browser/devtools/shared/resources/tests/style_document.html",
+      "https://example.com/browser/devtools/shared/commands/resource/tests/style_document.html",
     isNew: false,
     disabled: false,
     ruleCount: 1,
@@ -35,7 +35,7 @@ const EXISTING_RESOURCES = [
     styleText: "body { background-color: pink; }",
     href: null,
     nodeHref:
-      "https://example.org/browser/devtools/shared/resources/tests/style_iframe.html",
+      "https://example.org/browser/devtools/shared/commands/resource/tests/style_iframe.html",
     isNew: false,
     disabled: false,
     ruleCount: 1,
@@ -44,9 +44,9 @@ const EXISTING_RESOURCES = [
   {
     styleText: "body { padding: 1px; }",
     href:
-      "https://example.org/browser/devtools/shared/resources/tests/style_iframe.css",
+      "https://example.org/browser/devtools/shared/commands/resource/tests/style_iframe.css",
     nodeHref:
-      "https://example.org/browser/devtools/shared/resources/tests/style_iframe.html",
+      "https://example.org/browser/devtools/shared/commands/resource/tests/style_iframe.html",
     isNew: false,
     disabled: false,
     ruleCount: 1,
@@ -59,7 +59,7 @@ const ADDITIONAL_RESOURCE = {
     "@media all { body { color: red; } } @media print { body { color: cyan; } } body { font-size: 10px; }",
   href: null,
   nodeHref:
-    "https://example.com/browser/devtools/shared/resources/tests/style_document.html",
+    "https://example.com/browser/devtools/shared/commands/resource/tests/style_document.html",
   isNew: false,
   disabled: false,
   ruleCount: 3,
@@ -85,7 +85,7 @@ const ADDITIONAL_FROM_ACTOR_RESOURCE = {
   styleText: "body { font-size: 10px; }",
   href: null,
   nodeHref:
-    "https://example.com/browser/devtools/shared/resources/tests/style_document.html",
+    "https://example.com/browser/devtools/shared/commands/resource/tests/style_document.html",
   isNew: true,
   disabled: false,
   ruleCount: 1,

devtools/shared/commands/resource/tests/browser_resources_websocket.js

@@ -59,7 +59,7 @@ async function testWebsocketResources(target) {
   assertResource(availableResources[0], {
     wsMessageType: "webSocketOpened",
     effectiveURI:
-      "ws://mochi.test:8888/browser/devtools/shared/resources/tests/websocket_backend",
+      "ws://mochi.test:8888/browser/devtools/shared/commands/resource/tests/websocket_backend",
     extensions: "permessage-deflate",
     protocols: "",
   });

devtools/shared/commands/resource/tests/fission_document.html

@@ -11,14 +11,14 @@
   const params = new URLSearchParams(document.location.search);
 
   // eslint-disable-next-line no-unused-vars
-  const worker = new Worker("https://example.com/browser/devtools/shared/resources/tests/test_worker.js#simple-worker");
+  const worker = new Worker("https://example.com/browser/devtools/shared/commands/resource/tests/test_worker.js#simple-worker");
 
   // eslint-disable-next-line no-unused-vars
-  const sharedWorker = new SharedWorker("https://example.com/browser/devtools/shared/resources/tests/test_worker.js#shared-worker");
+  const sharedWorker = new SharedWorker("https://example.com/browser/devtools/shared/commands/resource/tests/test_worker.js#shared-worker");
 
   if (!params.has("noServiceWorker")) {
     // Expose a reference to the registration so that tests can unregister it.
-    window.registrationPromise = navigator.serviceWorker.register("https://example.com/browser/devtools/shared/resources/tests/test_service_worker.js#service-worker");
+    window.registrationPromise = navigator.serviceWorker.register("https://example.com/browser/devtools/shared/commands/resource/tests/test_service_worker.js#service-worker");
   }
 
   /* exported logMessageInWorker */
@@ -36,7 +36,7 @@
 <script>
   "use strict";
   const iframe = document.createElement("iframe");
-  let iframeUrl = `https://example.org/browser/devtools/shared/resources/tests/fission_iframe.html`;
+  let iframeUrl = `https://example.org/browser/devtools/shared/commands/resource/tests/fission_iframe.html`;
   if (document.location.search) {
     iframeUrl += `?${new URLSearchParams(document.location.search)}`;
   }

devtools/shared/commands/resource/tests/head.js

@@ -5,7 +5,7 @@
 "use strict";
 
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../client/shared/test/shared-head.js */
+/* import-globals-from ../../../../client/shared/test/shared-head.js */
 
 Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",

devtools/shared/commands/resource/tests/sse_frontend.html

@@ -25,7 +25,7 @@
         });
       }
     </script>
-    <iframe id="in-process-frame"  src="http://example.com/browser/devtools/shared/resources/tests/sse_frontend_iframe.html"> </iframe>
-    <iframe id="out-process-frame" src="http://example.org/browser/devtools/shared/resources/tests/sse_frontend_iframe.html"></iframe>
+    <iframe id="in-process-frame"  src="http://example.com/browser/devtools/shared/commands/resource/tests/sse_frontend_iframe.html"> </iframe>
+    <iframe id="out-process-frame" src="http://example.org/browser/devtools/shared/commands/resource/tests/sse_frontend_iframe.html"></iframe>
   </body>
 </html>

devtools/shared/commands/resource/tests/style_document.html

@@ -11,6 +11,6 @@
     <link href="style_document.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
-    <iframe src="https://example.org/browser/devtools/shared/resources/tests/style_iframe.html"></iframe>
+    <iframe src="https://example.org/browser/devtools/shared/commands/resource/tests/style_iframe.html"></iframe>
   </body>
 </html>

devtools/shared/commands/resource/tests/websocket_frontend.html

@@ -16,7 +16,7 @@
       function openConnection() {
         return new Promise(resolve => {
           webSocket = new WebSocket(
-            "ws://mochi.test:8888/browser/devtools/shared/resources/tests/websocket_backend"
+            "ws://mochi.test:8888/browser/devtools/shared/commands/resource/tests/websocket_backend"
           );
           webSocket.onopen = () => {
             resolve();
@@ -38,8 +38,8 @@
       }
     </script>
     <iframe id="in-process-frame"
-      src="http://example.com/browser/devtools/shared/resources/tests/websocket_frontend_iframe.html"></iframe>
+      src="http://example.com/browser/devtools/shared/commands/resource/tests/websocket_frontend_iframe.html"></iframe>
     <iframe id="out-process-frame"
-      src="http://example.org/browser/devtools/shared/resources/tests/websocket_frontend_iframe.html"></iframe>
+      src="http://example.org/browser/devtools/shared/commands/resource/tests/websocket_frontend_iframe.html"></iframe>
   </body>
 </html>

devtools/shared/commands/resource/tests/websocket_frontend_iframe.html

@@ -16,7 +16,7 @@
     function openConnection() {
       return new Promise(resolve => {
         webSocket = new WebSocket(
-          "ws://mochi.test:8888/browser/devtools/shared/resources/tests/websocket_backend"
+          "ws://mochi.test:8888/browser/devtools/shared/commands/resource/tests/websocket_backend"
         );
         webSocket.onopen = () => {
           resolve();

devtools/shared/moz.build

@@ -23,7 +23,6 @@ DIRS += [
     "platform",
     "protocol",
     "qrcode",
-    "resources",
     "security",
     "sprintfjs",
     "specs",

devtools/shared/resources/moz.build

@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-if CONFIG["MOZ_BUILD_APP"] != "mobile/android":
-    BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"]