Bug 1591006 - [remote] Re-arrange browser-chrome tests by domains as …

…subfolders. r=remote-protocol-reviewers,maja_zf Differential Revision: https://phabricator.services.mozilla.com/D51019
iaxat · Oct 30, 2019 · 9079bb1 · 9079bb1
1 parent 4b03ac2
commit 9079bb1
Show file tree

Hide file tree

Showing 31 changed files with 105 additions and 26 deletions.
diff --git a/remote/test/browser/browser.ini b/remote/test/browser/browser.ini
@@ -4,31 +4,9 @@ subsuite = remote
 prefs = remote.enabled=true
 support-files =
   chrome-remote-interface.js
-  doc_network_requestWillBeSent.html
-  file_network_requestWillBeSent.js
   head.js
 
 [browser_cdp.js]
 [browser_main_target.js]
-[browser_network_requestWillBeSent.js]
-[browser_page_bringToFront.js]
-[browser_page_captureScreenshot.js]
-[browser_page_frameNavigated.js]
-[browser_page_frameNavigated_iframe.js]
-[browser_page_javascriptDialog_alert.js]
-[browser_page_javascriptDialog_beforeunload.js]
-[browser_page_javascriptDialog_confirm.js]
-[browser_page_javascriptDialog_otherTarget.js]
-[browser_page_javascriptDialog_prompt.js]
-[browser_page_runtime_events.js]
-[browser_runtime_callFunctionOn.js]
-[browser_runtime_evaluate.js]
-[browser_runtime_executionContext.js]
-skip-if = os == "mac" || os == "win" # bug 1586503,1590930
-[browser_runtime_get_properties.js]
-[browser_runtime_remote_objects.js]
 [browser_session.js]
 [browser_tabs.js]
-[browser_target.js]
-[browser_target_browserContext.js]
-[browser_target_close.js]
diff --git a/remote/test/browser/network/browser.ini b/remote/test/browser/network/browser.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  doc_requestWillBeSent.html
+  file_requestWillBeSent.js
+  head.js
+
+[browser_requestWillBeSent.js]
diff --git a/...wser/browser_network_requestWillBeSent.js → ...wser/network/browser_requestWillBeSent.js b/...wser/browser_network_requestWillBeSent.js → ...wser/network/browser_requestWillBeSent.js
@@ -6,9 +6,9 @@
 // Test the Network.requestWillBeSent event
 
 const PAGE_URL =
-  "http://example.com/browser/remote/test/browser/doc_network_requestWillBeSent.html";
+  "http://example.com/browser/remote/test/browser/network/doc_requestWillBeSent.html";
 const JS_URL =
-  "http://example.com/browser/remote/test/browser/file_network_requestWillBeSent.js";
+  "http://example.com/browser/remote/test/browser/network/file_requestWillBeSent.js";
 
 add_task(async function(client) {
   const { Page, Network } = client;

diff --git a/...rowser/doc_network_requestWillBeSent.html → ...rowser/network/doc_requestWillBeSent.html b/...rowser/doc_network_requestWillBeSent.html → ...rowser/network/doc_requestWillBeSent.html
@@ -4,6 +4,6 @@
   <title>Test page for requestWillBeSent</title>
 </head>
 <body>
-  <script type="text/javascript" src="file_network_requestWillBeSent.js"></script>
+  <script type="text/javascript" src="file_requestWillBeSent.js"></script>
 </body>
 </html>
diff --git a/...browser/file_network_requestWillBeSent.js → ...browser/network/file_requestWillBeSent.js b/...browser/file_network_requestWillBeSent.js → ...browser/network/file_requestWillBeSent.js
diff --git a/remote/test/browser/network/head.js b/remote/test/browser/network/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
diff --git a/remote/test/browser/page/browser.ini b/remote/test/browser/page/browser.ini
@@ -0,0 +1,17 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  head.js
+
+[browser_bringToFront.js]
+[browser_captureScreenshot.js]
+[browser_frameNavigated.js]
+[browser_frameNavigated_iframe.js]
+[browser_javascriptDialog_alert.js]
+[browser_javascriptDialog_beforeunload.js]
+[browser_javascriptDialog_confirm.js]
+[browser_javascriptDialog_otherTarget.js]
+[browser_javascriptDialog_prompt.js]
+[browser_runtimeEvents.js]
diff --git a/...test/browser/browser_page_bringToFront.js → ...test/browser/page/browser_bringToFront.js b/...test/browser/browser_page_bringToFront.js → ...test/browser/page/browser_bringToFront.js
diff --git a/...browser/browser_page_captureScreenshot.js → ...browser/page/browser_captureScreenshot.js b/...browser/browser_page_captureScreenshot.js → ...browser/page/browser_captureScreenshot.js
diff --git a/...st/browser/browser_page_frameNavigated.js → ...st/browser/page/browser_frameNavigated.js b/...st/browser/browser_page_frameNavigated.js → ...st/browser/page/browser_frameNavigated.js
diff --git a/...ser/browser_page_frameNavigated_iframe.js → ...ser/page/browser_frameNavigated_iframe.js b/...ser/browser_page_frameNavigated_iframe.js → ...ser/page/browser_frameNavigated_iframe.js
diff --git a/...er/browser_page_javascriptDialog_alert.js → ...er/page/browser_javascriptDialog_alert.js b/...er/browser_page_javascriptDialog_alert.js → ...er/page/browser_javascriptDialog_alert.js
diff --git a/...ser_page_javascriptDialog_beforeunload.js → .../browser_javascriptDialog_beforeunload.js b/...ser_page_javascriptDialog_beforeunload.js → .../browser_javascriptDialog_beforeunload.js
diff --git a/.../browser_page_javascriptDialog_confirm.js → .../page/browser_javascriptDialog_confirm.js b/.../browser_page_javascriptDialog_confirm.js → .../page/browser_javascriptDialog_confirm.js
diff --git a/...wser_page_javascriptDialog_otherTarget.js → ...e/browser_javascriptDialog_otherTarget.js b/...wser_page_javascriptDialog_otherTarget.js → ...e/browser_javascriptDialog_otherTarget.js
diff --git a/...r/browser_page_javascriptDialog_prompt.js → ...r/page/browser_javascriptDialog_prompt.js b/...r/browser_page_javascriptDialog_prompt.js → ...r/page/browser_javascriptDialog_prompt.js
diff --git a/...st/browser/browser_page_runtime_events.js → ...est/browser/page/browser_runtimeEvents.js b/...st/browser/browser_page_runtime_events.js → ...est/browser/page/browser_runtimeEvents.js
diff --git a/remote/test/browser/page/head.js b/remote/test/browser/page/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
diff --git a/remote/test/browser/runtime/browser.ini b/remote/test/browser/runtime/browser.ini
@@ -0,0 +1,13 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  head.js
+
+[browser_callFunctionOn.js]
+[browser_evaluate.js]
+[browser_executionContext.js]
+skip-if = os == "mac" || os == "win" # bug 1586503,1590930
+[browser_getProperties.js]
+[browser_remoteObjects.js]
diff --git a/...browser/browser_runtime_callFunctionOn.js → ...browser/runtime/browser_callFunctionOn.js b/...browser/browser_runtime_callFunctionOn.js → ...browser/runtime/browser_callFunctionOn.js
diff --git a/.../test/browser/browser_runtime_evaluate.js → .../test/browser/runtime/browser_evaluate.js b/.../test/browser/browser_runtime_evaluate.js → .../test/browser/runtime/browser_evaluate.js
diff --git a/...owser/browser_runtime_executionContext.js → ...owser/runtime/browser_executionContext.js b/...owser/browser_runtime_executionContext.js → ...owser/runtime/browser_executionContext.js
diff --git a/...browser/browser_runtime_get_properties.js → .../browser/runtime/browser_getProperties.js b/...browser/browser_runtime_get_properties.js → .../browser/runtime/browser_getProperties.js
diff --git a/...browser/browser_runtime_remote_objects.js → .../browser/runtime/browser_remoteObjects.js b/...browser/browser_runtime_remote_objects.js → .../browser/runtime/browser_remoteObjects.js
diff --git a/remote/test/browser/runtime/head.js b/remote/test/browser/runtime/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
diff --git a/remote/test/browser/target/browser.ini b/remote/test/browser/target/browser.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  head.js
+
+[browser_target.js]
+[browser_browserContext.js]
+[browser_closeTarget.js]
diff --git a/.../browser/browser_target_browserContext.js → .../browser/target/browser_browserContext.js b/.../browser/browser_target_browserContext.js → .../browser/target/browser_browserContext.js
diff --git a/remote/test/browser/browser_target_close.js → ...est/browser/target/browser_closeTarget.js b/remote/test/browser/browser_target_close.js → ...est/browser/target/browser_closeTarget.js
diff --git a/remote/test/browser/browser_target.js → remote/test/browser/target/browser_target.js b/remote/test/browser/browser_target.js → remote/test/browser/target/browser_target.js
diff --git a/remote/test/browser/target/head.js b/remote/test/browser/target/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
diff --git a/remote/test/moz.build b/remote/test/moz.build
@@ -3,7 +3,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"]
-BROWSER_CHROME_MANIFESTS += ["browser/browser.ini", "browser/input/browser.ini"]
+BROWSER_CHROME_MANIFESTS += [
+    "browser/browser.ini",
+    "browser/input/browser.ini",
+    "browser/network/browser.ini",
+    "browser/page/browser.ini",
+    "browser/runtime/browser.ini",
+    "browser/target/browser.ini",
+]
 
 with Files("puppeteer/test/**/*.spec.js"):
     IMPACTED_TESTS.flavors += ["puppeteer"]