From f68309ef230a2bb091152768f3a436357585e8c9 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 30 Oct 2019 13:25:56 +0000 Subject: [PATCH] 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 --HG-- rename : remote/test/browser/browser_network_requestWillBeSent.js => remote/test/browser/network/browser_requestWillBeSent.js rename : remote/test/browser/doc_network_requestWillBeSent.html => remote/test/browser/network/doc_requestWillBeSent.html rename : remote/test/browser/file_network_requestWillBeSent.js => remote/test/browser/network/file_requestWillBeSent.js rename : remote/test/browser/browser_page_bringToFront.js => remote/test/browser/page/browser_bringToFront.js rename : remote/test/browser/browser_page_captureScreenshot.js => remote/test/browser/page/browser_captureScreenshot.js rename : remote/test/browser/browser_page_frameNavigated.js => remote/test/browser/page/browser_frameNavigated.js rename : remote/test/browser/browser_page_frameNavigated_iframe.js => remote/test/browser/page/browser_frameNavigated_iframe.js rename : remote/test/browser/browser_page_javascriptDialog_alert.js => remote/test/browser/page/browser_javascriptDialog_alert.js rename : remote/test/browser/browser_page_javascriptDialog_beforeunload.js => remote/test/browser/page/browser_javascriptDialog_beforeunload.js rename : remote/test/browser/browser_page_javascriptDialog_confirm.js => remote/test/browser/page/browser_javascriptDialog_confirm.js rename : remote/test/browser/browser_page_javascriptDialog_otherTarget.js => remote/test/browser/page/browser_javascriptDialog_otherTarget.js rename : remote/test/browser/browser_page_javascriptDialog_prompt.js => remote/test/browser/page/browser_javascriptDialog_prompt.js rename : remote/test/browser/browser_page_runtime_events.js => remote/test/browser/page/browser_runtimeEvents.js rename : remote/test/browser/browser_runtime_callFunctionOn.js => remote/test/browser/runtime/browser_callFunctionOn.js rename : remote/test/browser/browser_runtime_evaluate.js => remote/test/browser/runtime/browser_evaluate.js rename : remote/test/browser/browser_runtime_executionContext.js => remote/test/browser/runtime/browser_executionContext.js rename : remote/test/browser/browser_runtime_get_properties.js => remote/test/browser/runtime/browser_getProperties.js rename : remote/test/browser/browser_runtime_remote_objects.js => remote/test/browser/runtime/browser_remoteObjects.js rename : remote/test/browser/browser_target_browserContext.js => remote/test/browser/target/browser_browserContext.js rename : remote/test/browser/browser_target_close.js => remote/test/browser/target/browser_closeTarget.js rename : remote/test/browser/browser_target.js => remote/test/browser/target/browser_target.js extra : moz-landing-system : lando --- remote/test/browser/browser.ini | 22 ------------------- remote/test/browser/network/browser.ini | 10 +++++++++ .../browser_requestWillBeSent.js} | 4 ++-- .../doc_requestWillBeSent.html} | 2 +- .../file_requestWillBeSent.js} | 0 remote/test/browser/network/head.js | 11 ++++++++++ remote/test/browser/page/browser.ini | 17 ++++++++++++++ .../browser_bringToFront.js} | 0 .../browser_captureScreenshot.js} | 0 .../browser_frameNavigated.js} | 0 .../browser_frameNavigated_iframe.js} | 0 .../browser_javascriptDialog_alert.js} | 0 .../browser_javascriptDialog_beforeunload.js} | 0 .../browser_javascriptDialog_confirm.js} | 0 .../browser_javascriptDialog_otherTarget.js} | 0 .../browser_javascriptDialog_prompt.js} | 0 .../browser_runtimeEvents.js} | 0 remote/test/browser/page/head.js | 11 ++++++++++ remote/test/browser/runtime/browser.ini | 13 +++++++++++ .../browser_callFunctionOn.js} | 0 .../browser_evaluate.js} | 0 .../browser_executionContext.js} | 0 .../browser_getProperties.js} | 0 .../browser_remoteObjects.js} | 0 remote/test/browser/runtime/head.js | 11 ++++++++++ remote/test/browser/target/browser.ini | 10 +++++++++ .../browser_browserContext.js} | 0 .../browser_closeTarget.js} | 0 .../browser/{ => target}/browser_target.js | 0 remote/test/browser/target/head.js | 11 ++++++++++ remote/test/moz.build | 9 +++++++- 31 files changed, 105 insertions(+), 26 deletions(-) create mode 100644 remote/test/browser/network/browser.ini rename remote/test/browser/{browser_network_requestWillBeSent.js => network/browser_requestWillBeSent.js} (91%) rename remote/test/browser/{doc_network_requestWillBeSent.html => network/doc_requestWillBeSent.html} (56%) rename remote/test/browser/{file_network_requestWillBeSent.js => network/file_requestWillBeSent.js} (100%) create mode 100644 remote/test/browser/network/head.js create mode 100644 remote/test/browser/page/browser.ini rename remote/test/browser/{browser_page_bringToFront.js => page/browser_bringToFront.js} (100%) rename remote/test/browser/{browser_page_captureScreenshot.js => page/browser_captureScreenshot.js} (100%) rename remote/test/browser/{browser_page_frameNavigated.js => page/browser_frameNavigated.js} (100%) rename remote/test/browser/{browser_page_frameNavigated_iframe.js => page/browser_frameNavigated_iframe.js} (100%) rename remote/test/browser/{browser_page_javascriptDialog_alert.js => page/browser_javascriptDialog_alert.js} (100%) rename remote/test/browser/{browser_page_javascriptDialog_beforeunload.js => page/browser_javascriptDialog_beforeunload.js} (100%) rename remote/test/browser/{browser_page_javascriptDialog_confirm.js => page/browser_javascriptDialog_confirm.js} (100%) rename remote/test/browser/{browser_page_javascriptDialog_otherTarget.js => page/browser_javascriptDialog_otherTarget.js} (100%) rename remote/test/browser/{browser_page_javascriptDialog_prompt.js => page/browser_javascriptDialog_prompt.js} (100%) rename remote/test/browser/{browser_page_runtime_events.js => page/browser_runtimeEvents.js} (100%) create mode 100644 remote/test/browser/page/head.js create mode 100644 remote/test/browser/runtime/browser.ini rename remote/test/browser/{browser_runtime_callFunctionOn.js => runtime/browser_callFunctionOn.js} (100%) rename remote/test/browser/{browser_runtime_evaluate.js => runtime/browser_evaluate.js} (100%) rename remote/test/browser/{browser_runtime_executionContext.js => runtime/browser_executionContext.js} (100%) rename remote/test/browser/{browser_runtime_get_properties.js => runtime/browser_getProperties.js} (100%) rename remote/test/browser/{browser_runtime_remote_objects.js => runtime/browser_remoteObjects.js} (100%) create mode 100644 remote/test/browser/runtime/head.js create mode 100644 remote/test/browser/target/browser.ini rename remote/test/browser/{browser_target_browserContext.js => target/browser_browserContext.js} (100%) rename remote/test/browser/{browser_target_close.js => target/browser_closeTarget.js} (100%) rename remote/test/browser/{ => target}/browser_target.js (100%) create mode 100644 remote/test/browser/target/head.js diff --git a/remote/test/browser/browser.ini b/remote/test/browser/browser.ini index 0d00da74bc50..5559e4d90d32 100644 --- 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 new file mode 100644 index 000000000000..59c1070d39e7 --- /dev/null +++ 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/remote/test/browser/browser_network_requestWillBeSent.js b/remote/test/browser/network/browser_requestWillBeSent.js similarity index 91% rename from remote/test/browser/browser_network_requestWillBeSent.js rename to remote/test/browser/network/browser_requestWillBeSent.js index 5a0d0ac2af84..0bd0a2893488 100644 --- a/remote/test/browser/browser_network_requestWillBeSent.js +++ b/remote/test/browser/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/remote/test/browser/doc_network_requestWillBeSent.html b/remote/test/browser/network/doc_requestWillBeSent.html similarity index 56% rename from remote/test/browser/doc_network_requestWillBeSent.html rename to remote/test/browser/network/doc_requestWillBeSent.html index 66ddee75f488..e17c357d9b4d 100644 --- a/remote/test/browser/doc_network_requestWillBeSent.html +++ b/remote/test/browser/network/doc_requestWillBeSent.html @@ -4,6 +4,6 @@ Test page for requestWillBeSent - + diff --git a/remote/test/browser/file_network_requestWillBeSent.js b/remote/test/browser/network/file_requestWillBeSent.js similarity index 100% rename from remote/test/browser/file_network_requestWillBeSent.js rename to remote/test/browser/network/file_requestWillBeSent.js diff --git a/remote/test/browser/network/head.js b/remote/test/browser/network/head.js new file mode 100644 index 000000000000..7131e98b6f0c --- /dev/null +++ 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 new file mode 100644 index 000000000000..a82365df4bc2 --- /dev/null +++ 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/remote/test/browser/browser_page_bringToFront.js b/remote/test/browser/page/browser_bringToFront.js similarity index 100% rename from remote/test/browser/browser_page_bringToFront.js rename to remote/test/browser/page/browser_bringToFront.js diff --git a/remote/test/browser/browser_page_captureScreenshot.js b/remote/test/browser/page/browser_captureScreenshot.js similarity index 100% rename from remote/test/browser/browser_page_captureScreenshot.js rename to remote/test/browser/page/browser_captureScreenshot.js diff --git a/remote/test/browser/browser_page_frameNavigated.js b/remote/test/browser/page/browser_frameNavigated.js similarity index 100% rename from remote/test/browser/browser_page_frameNavigated.js rename to remote/test/browser/page/browser_frameNavigated.js diff --git a/remote/test/browser/browser_page_frameNavigated_iframe.js b/remote/test/browser/page/browser_frameNavigated_iframe.js similarity index 100% rename from remote/test/browser/browser_page_frameNavigated_iframe.js rename to remote/test/browser/page/browser_frameNavigated_iframe.js diff --git a/remote/test/browser/browser_page_javascriptDialog_alert.js b/remote/test/browser/page/browser_javascriptDialog_alert.js similarity index 100% rename from remote/test/browser/browser_page_javascriptDialog_alert.js rename to remote/test/browser/page/browser_javascriptDialog_alert.js diff --git a/remote/test/browser/browser_page_javascriptDialog_beforeunload.js b/remote/test/browser/page/browser_javascriptDialog_beforeunload.js similarity index 100% rename from remote/test/browser/browser_page_javascriptDialog_beforeunload.js rename to remote/test/browser/page/browser_javascriptDialog_beforeunload.js diff --git a/remote/test/browser/browser_page_javascriptDialog_confirm.js b/remote/test/browser/page/browser_javascriptDialog_confirm.js similarity index 100% rename from remote/test/browser/browser_page_javascriptDialog_confirm.js rename to remote/test/browser/page/browser_javascriptDialog_confirm.js diff --git a/remote/test/browser/browser_page_javascriptDialog_otherTarget.js b/remote/test/browser/page/browser_javascriptDialog_otherTarget.js similarity index 100% rename from remote/test/browser/browser_page_javascriptDialog_otherTarget.js rename to remote/test/browser/page/browser_javascriptDialog_otherTarget.js diff --git a/remote/test/browser/browser_page_javascriptDialog_prompt.js b/remote/test/browser/page/browser_javascriptDialog_prompt.js similarity index 100% rename from remote/test/browser/browser_page_javascriptDialog_prompt.js rename to remote/test/browser/page/browser_javascriptDialog_prompt.js diff --git a/remote/test/browser/browser_page_runtime_events.js b/remote/test/browser/page/browser_runtimeEvents.js similarity index 100% rename from remote/test/browser/browser_page_runtime_events.js rename to remote/test/browser/page/browser_runtimeEvents.js diff --git a/remote/test/browser/page/head.js b/remote/test/browser/page/head.js new file mode 100644 index 000000000000..7131e98b6f0c --- /dev/null +++ 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 new file mode 100644 index 000000000000..f58ae6ccb887 --- /dev/null +++ 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/remote/test/browser/browser_runtime_callFunctionOn.js b/remote/test/browser/runtime/browser_callFunctionOn.js similarity index 100% rename from remote/test/browser/browser_runtime_callFunctionOn.js rename to remote/test/browser/runtime/browser_callFunctionOn.js diff --git a/remote/test/browser/browser_runtime_evaluate.js b/remote/test/browser/runtime/browser_evaluate.js similarity index 100% rename from remote/test/browser/browser_runtime_evaluate.js rename to remote/test/browser/runtime/browser_evaluate.js diff --git a/remote/test/browser/browser_runtime_executionContext.js b/remote/test/browser/runtime/browser_executionContext.js similarity index 100% rename from remote/test/browser/browser_runtime_executionContext.js rename to remote/test/browser/runtime/browser_executionContext.js diff --git a/remote/test/browser/browser_runtime_get_properties.js b/remote/test/browser/runtime/browser_getProperties.js similarity index 100% rename from remote/test/browser/browser_runtime_get_properties.js rename to remote/test/browser/runtime/browser_getProperties.js diff --git a/remote/test/browser/browser_runtime_remote_objects.js b/remote/test/browser/runtime/browser_remoteObjects.js similarity index 100% rename from remote/test/browser/browser_runtime_remote_objects.js rename to remote/test/browser/runtime/browser_remoteObjects.js diff --git a/remote/test/browser/runtime/head.js b/remote/test/browser/runtime/head.js new file mode 100644 index 000000000000..7131e98b6f0c --- /dev/null +++ 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 new file mode 100644 index 000000000000..b01acfe4cda2 --- /dev/null +++ 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/remote/test/browser/browser_target_browserContext.js b/remote/test/browser/target/browser_browserContext.js similarity index 100% rename from remote/test/browser/browser_target_browserContext.js rename to remote/test/browser/target/browser_browserContext.js diff --git a/remote/test/browser/browser_target_close.js b/remote/test/browser/target/browser_closeTarget.js similarity index 100% rename from remote/test/browser/browser_target_close.js rename to remote/test/browser/target/browser_closeTarget.js diff --git a/remote/test/browser/browser_target.js b/remote/test/browser/target/browser_target.js similarity index 100% rename from remote/test/browser/browser_target.js rename to remote/test/browser/target/browser_target.js diff --git a/remote/test/browser/target/head.js b/remote/test/browser/target/head.js new file mode 100644 index 000000000000..7131e98b6f0c --- /dev/null +++ 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 index c348a9419341..5717e47347f5 100644 --- 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"]