diff --git a/.eslintignore b/.eslintignore index 3d43e26bee47..2a4ddeb509d1 100644 --- a/.eslintignore +++ b/.eslintignore @@ -127,10 +127,10 @@ devtools/client/storage/test/*.html !devtools/client/storage/test/storage-unsecured-iframe.html !devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html devtools/client/webaudioeditor/** -devtools/client/webconsole/net/** +devtools/client/webconsole/old/net/** !devtools/client/webconsole/new-console-output/test/mochitest/** -devtools/client/webconsole/test/** -devtools/client/webconsole/webconsole.js +devtools/client/webconsole/old/test/** +devtools/client/webconsole/old/webconsole.js devtools/client/webide/** !devtools/client/webide/components/webideCli.js devtools/server/tests/browser/storage-*.html diff --git a/devtools/.eslintrc.js b/devtools/.eslintrc.js index e2fe4b090dd8..b37ca6ec9554 100644 --- a/devtools/.eslintrc.js +++ b/devtools/.eslintrc.js @@ -374,7 +374,7 @@ module.exports = { // Warn about invalid JSDoc comments. // Disabled for now because of https://github.com/eslint/eslint/issues/2270 // The rule fails on some jsdoc comments like in: - // devtools/client/webconsole/console-output.js + // devtools/client/webconsole/old/console-output.js "valid-jsdoc": "off", // Allow vars to be declared anywhere in the scope. "vars-on-top": "off", diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js index 3ea5c528ff9a..99be600b3b18 100644 --- a/devtools/client/definitions.js +++ b/devtools/client/definitions.js @@ -99,7 +99,7 @@ Tools.webConsole = { id: "webconsole", accesskey: l10n("webConsoleCmd.accesskey"), ordinal: 2, - oldWebConsoleURL: "chrome://devtools/content/webconsole/webconsole.xul", + oldWebConsoleURL: "chrome://devtools/content/webconsole/old/webconsole.xul", newWebConsoleURL: "chrome://devtools/content/webconsole/webconsole.html", get browserConsoleURL() { if (Services.prefs.getBoolPref("devtools.browserconsole.new-frontend-enabled")) { diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 7e649265514a..3cc142d2d268 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -10,7 +10,7 @@ devtools.jar: content/shared/widgets/VariablesView.xul (shared/widgets/VariablesView.xul) content/webconsole/webconsole.html (webconsole/webconsole.html) content/webconsole/browserconsole.xul (webconsole/browserconsole.xul) -* content/webconsole/webconsole.xul (webconsole/webconsole.xul) +* content/webconsole/old/webconsole.xul (webconsole/old/webconsole.xul) * content/scratchpad/scratchpad.xul (scratchpad/scratchpad.xul) content/scratchpad/scratchpad.js (scratchpad/scratchpad.js) content/shared/splitview.css (shared/splitview.css) diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js index 7dc67dad9513..f00ced4ed4e1 100644 --- a/devtools/client/webconsole/hudservice.js +++ b/devtools/client/webconsole/hudservice.js @@ -11,7 +11,7 @@ loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/targe loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true); loader.lazyRequireGetter(this, "Tools", "devtools/client/definitions", true); loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry"); -loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/webconsole", true); +loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/old/webconsole", true); loader.lazyRequireGetter(this, "NewWebConsoleFrame", "devtools/client/webconsole/new-webconsole", true); loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true); loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true); diff --git a/devtools/client/webconsole/jsterm.js b/devtools/client/webconsole/jsterm.js index 1082a0b2cb32..1b3f0ca1ed9c 100644 --- a/devtools/client/webconsole/jsterm.js +++ b/devtools/client/webconsole/jsterm.js @@ -19,7 +19,7 @@ loader.lazyServiceGetter(this, "clipboardHelper", loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter"); loader.lazyRequireGetter(this, "AutocompletePopup", "devtools/client/shared/autocomplete-popup"); loader.lazyRequireGetter(this, "ToolSidebar", "devtools/client/framework/sidebar", true); -loader.lazyRequireGetter(this, "Messages", "devtools/client/webconsole/console-output", true); +loader.lazyRequireGetter(this, "Messages", "devtools/client/webconsole/old/console-output", true); loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage"); loader.lazyRequireGetter(this, "EnvironmentClient", "devtools/shared/client/environment-client"); loader.lazyRequireGetter(this, "ObjectClient", "devtools/shared/client/object-client"); diff --git a/devtools/client/webconsole/moz.build b/devtools/client/webconsole/moz.build index 24a5ce4eda7e..db434a03a4da 100644 --- a/devtools/client/webconsole/moz.build +++ b/devtools/client/webconsole/moz.build @@ -4,15 +4,12 @@ # 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/. -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - DIRS += [ - 'net', 'new-console-output', + 'old', ] DevToolsModules( 'console-commands.js', - 'console-output.js', 'hudservice.js', 'jsterm.js', 'new-webconsole.js', @@ -20,7 +17,6 @@ DevToolsModules( 'utils.js', 'webconsole-connection-proxy.js', 'webconsole-l10n.js', - 'webconsole.js', ) with Files('**'): BUG_COMPONENT = ('Firefox', 'Developer Tools: Console') diff --git a/devtools/client/webconsole/console-output.js b/devtools/client/webconsole/old/console-output.js similarity index 100% rename from devtools/client/webconsole/console-output.js rename to devtools/client/webconsole/old/console-output.js diff --git a/devtools/client/webconsole/old/moz.build b/devtools/client/webconsole/old/moz.build new file mode 100644 index 000000000000..3fa9c387b90b --- /dev/null +++ b/devtools/client/webconsole/old/moz.build @@ -0,0 +1,17 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] + +DIRS += [ + 'net', +] +DevToolsModules( + 'console-output.js', + 'webconsole.js', +) +with Files('**'): + BUG_COMPONENT = ('Firefox', 'Developer Tools: Console') diff --git a/devtools/client/webconsole/net/.eslintrc.js b/devtools/client/webconsole/old/net/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/net/.eslintrc.js rename to devtools/client/webconsole/old/net/.eslintrc.js diff --git a/devtools/client/webconsole/net/components/cookies-tab.js b/devtools/client/webconsole/old/net/components/cookies-tab.js similarity index 100% rename from devtools/client/webconsole/net/components/cookies-tab.js rename to devtools/client/webconsole/old/net/components/cookies-tab.js diff --git a/devtools/client/webconsole/net/components/headers-tab.js b/devtools/client/webconsole/old/net/components/headers-tab.js similarity index 100% rename from devtools/client/webconsole/net/components/headers-tab.js rename to devtools/client/webconsole/old/net/components/headers-tab.js diff --git a/devtools/client/webconsole/net/components/moz.build b/devtools/client/webconsole/old/net/components/moz.build similarity index 100% rename from devtools/client/webconsole/net/components/moz.build rename to devtools/client/webconsole/old/net/components/moz.build diff --git a/devtools/client/webconsole/net/components/net-info-body.css b/devtools/client/webconsole/old/net/components/net-info-body.css similarity index 100% rename from devtools/client/webconsole/net/components/net-info-body.css rename to devtools/client/webconsole/old/net/components/net-info-body.css diff --git a/devtools/client/webconsole/net/components/net-info-body.js b/devtools/client/webconsole/old/net/components/net-info-body.js similarity index 100% rename from devtools/client/webconsole/net/components/net-info-body.js rename to devtools/client/webconsole/old/net/components/net-info-body.js diff --git a/devtools/client/webconsole/net/components/net-info-group-list.js b/devtools/client/webconsole/old/net/components/net-info-group-list.js similarity index 100% rename from devtools/client/webconsole/net/components/net-info-group-list.js rename to devtools/client/webconsole/old/net/components/net-info-group-list.js diff --git a/devtools/client/webconsole/net/components/net-info-group.css b/devtools/client/webconsole/old/net/components/net-info-group.css similarity index 100% rename from devtools/client/webconsole/net/components/net-info-group.css rename to devtools/client/webconsole/old/net/components/net-info-group.css diff --git a/devtools/client/webconsole/net/components/net-info-group.js b/devtools/client/webconsole/old/net/components/net-info-group.js similarity index 100% rename from devtools/client/webconsole/net/components/net-info-group.js rename to devtools/client/webconsole/old/net/components/net-info-group.js diff --git a/devtools/client/webconsole/net/components/net-info-params.css b/devtools/client/webconsole/old/net/components/net-info-params.css similarity index 100% rename from devtools/client/webconsole/net/components/net-info-params.css rename to devtools/client/webconsole/old/net/components/net-info-params.css diff --git a/devtools/client/webconsole/net/components/net-info-params.js b/devtools/client/webconsole/old/net/components/net-info-params.js similarity index 100% rename from devtools/client/webconsole/net/components/net-info-params.js rename to devtools/client/webconsole/old/net/components/net-info-params.js diff --git a/devtools/client/webconsole/net/components/params-tab.js b/devtools/client/webconsole/old/net/components/params-tab.js similarity index 100% rename from devtools/client/webconsole/net/components/params-tab.js rename to devtools/client/webconsole/old/net/components/params-tab.js diff --git a/devtools/client/webconsole/net/components/post-tab.js b/devtools/client/webconsole/old/net/components/post-tab.js similarity index 100% rename from devtools/client/webconsole/net/components/post-tab.js rename to devtools/client/webconsole/old/net/components/post-tab.js diff --git a/devtools/client/webconsole/net/components/response-tab.css b/devtools/client/webconsole/old/net/components/response-tab.css similarity index 100% rename from devtools/client/webconsole/net/components/response-tab.css rename to devtools/client/webconsole/old/net/components/response-tab.css diff --git a/devtools/client/webconsole/net/components/response-tab.js b/devtools/client/webconsole/old/net/components/response-tab.js similarity index 100% rename from devtools/client/webconsole/net/components/response-tab.js rename to devtools/client/webconsole/old/net/components/response-tab.js diff --git a/devtools/client/webconsole/net/components/size-limit.css b/devtools/client/webconsole/old/net/components/size-limit.css similarity index 100% rename from devtools/client/webconsole/net/components/size-limit.css rename to devtools/client/webconsole/old/net/components/size-limit.css diff --git a/devtools/client/webconsole/net/components/size-limit.js b/devtools/client/webconsole/old/net/components/size-limit.js similarity index 100% rename from devtools/client/webconsole/net/components/size-limit.js rename to devtools/client/webconsole/old/net/components/size-limit.js diff --git a/devtools/client/webconsole/net/components/spinner.js b/devtools/client/webconsole/old/net/components/spinner.js similarity index 100% rename from devtools/client/webconsole/net/components/spinner.js rename to devtools/client/webconsole/old/net/components/spinner.js diff --git a/devtools/client/webconsole/net/components/stacktrace-tab.js b/devtools/client/webconsole/old/net/components/stacktrace-tab.js similarity index 100% rename from devtools/client/webconsole/net/components/stacktrace-tab.js rename to devtools/client/webconsole/old/net/components/stacktrace-tab.js diff --git a/devtools/client/webconsole/net/data-provider.js b/devtools/client/webconsole/old/net/data-provider.js similarity index 100% rename from devtools/client/webconsole/net/data-provider.js rename to devtools/client/webconsole/old/net/data-provider.js diff --git a/devtools/client/webconsole/net/main.js b/devtools/client/webconsole/old/net/main.js similarity index 83% rename from devtools/client/webconsole/net/main.js rename to devtools/client/webconsole/old/net/main.js index 1d76c890146d..15cc9e8cd18a 100644 --- a/devtools/client/webconsole/net/main.js +++ b/devtools/client/webconsole/old/net/main.js @@ -8,7 +8,7 @@ // Initialize module loader and load all modules of the new inline // preview feature. The entire code-base doesn't need any extra // privileges and runs entirely in content scope. -const rootUrl = "resource://devtools/client/webconsole/net/"; +const rootUrl = "resource://devtools/client/webconsole/old/net/"; const require = BrowserLoader({ baseURI: rootUrl, window}).require; @@ -25,12 +25,12 @@ var styleSheets = [ "resource://devtools/client/jsonview/css/toolbar.css", "resource://devtools/client/shared/components/tree/TreeView.css", "resource://devtools/client/shared/components/reps.css", - "resource://devtools/client/webconsole/net/net-request.css", - "resource://devtools/client/webconsole/net/components/size-limit.css", - "resource://devtools/client/webconsole/net/components/net-info-body.css", - "resource://devtools/client/webconsole/net/components/net-info-group.css", - "resource://devtools/client/webconsole/net/components/net-info-params.css", - "resource://devtools/client/webconsole/net/components/response-tab.css" + "resource://devtools/client/webconsole/old/net/net-request.css", + "resource://devtools/client/webconsole/old/net/components/size-limit.css", + "resource://devtools/client/webconsole/old/net/components/net-info-body.css", + "resource://devtools/client/webconsole/old/net/components/net-info-group.css", + "resource://devtools/client/webconsole/old/net/components/net-info-params.css", + "resource://devtools/client/webconsole/old/net/components/response-tab.css" ]; // Load theme stylesheets into the Console frame. This should be diff --git a/devtools/client/webconsole/net/moz.build b/devtools/client/webconsole/old/net/moz.build similarity index 100% rename from devtools/client/webconsole/net/moz.build rename to devtools/client/webconsole/old/net/moz.build diff --git a/devtools/client/webconsole/net/net-request.css b/devtools/client/webconsole/old/net/net-request.css similarity index 100% rename from devtools/client/webconsole/net/net-request.css rename to devtools/client/webconsole/old/net/net-request.css diff --git a/devtools/client/webconsole/net/net-request.js b/devtools/client/webconsole/old/net/net-request.js similarity index 100% rename from devtools/client/webconsole/net/net-request.js rename to devtools/client/webconsole/old/net/net-request.js diff --git a/devtools/client/webconsole/net/test/mochitest/.eslintrc.js b/devtools/client/webconsole/old/net/test/mochitest/.eslintrc.js similarity index 64% rename from devtools/client/webconsole/net/test/mochitest/.eslintrc.js rename to devtools/client/webconsole/old/net/test/mochitest/.eslintrc.js index 76904829d549..c4451327c74d 100644 --- a/devtools/client/webconsole/net/test/mochitest/.eslintrc.js +++ b/devtools/client/webconsole/old/net/test/mochitest/.eslintrc.js @@ -2,5 +2,5 @@ module.exports = { // Extend from the shared list of defined globals for mochitests. - "extends": "../../../../../.eslintrc.mochitests.js", + "extends": "../../../../../../.eslintrc.mochitests.js", }; diff --git a/devtools/client/webconsole/net/test/mochitest/browser.ini b/devtools/client/webconsole/old/net/test/mochitest/browser.ini similarity index 90% rename from devtools/client/webconsole/net/test/mochitest/browser.ini rename to devtools/client/webconsole/old/net/test/mochitest/browser.ini index 6c4a424f9950..f869efe8a52b 100644 --- a/devtools/client/webconsole/net/test/mochitest/browser.ini +++ b/devtools/client/webconsole/old/net/test/mochitest/browser.ini @@ -13,7 +13,7 @@ support-files = test.xml^headers^ !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js - !/devtools/client/webconsole/test/head.js + !/devtools/client/webconsole/old/test/head.js [browser_net_basic.js] [browser_net_cookies.js] diff --git a/devtools/client/webconsole/net/test/mochitest/browser_net_basic.js b/devtools/client/webconsole/old/net/test/mochitest/browser_net_basic.js similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/browser_net_basic.js rename to devtools/client/webconsole/old/net/test/mochitest/browser_net_basic.js diff --git a/devtools/client/webconsole/net/test/mochitest/browser_net_cookies.js b/devtools/client/webconsole/old/net/test/mochitest/browser_net_cookies.js similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/browser_net_cookies.js rename to devtools/client/webconsole/old/net/test/mochitest/browser_net_cookies.js diff --git a/devtools/client/webconsole/net/test/mochitest/browser_net_headers.js b/devtools/client/webconsole/old/net/test/mochitest/browser_net_headers.js similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/browser_net_headers.js rename to devtools/client/webconsole/old/net/test/mochitest/browser_net_headers.js diff --git a/devtools/client/webconsole/net/test/mochitest/browser_net_params.js b/devtools/client/webconsole/old/net/test/mochitest/browser_net_params.js similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/browser_net_params.js rename to devtools/client/webconsole/old/net/test/mochitest/browser_net_params.js diff --git a/devtools/client/webconsole/net/test/mochitest/browser_net_post.js b/devtools/client/webconsole/old/net/test/mochitest/browser_net_post.js similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/browser_net_post.js rename to devtools/client/webconsole/old/net/test/mochitest/browser_net_post.js diff --git a/devtools/client/webconsole/net/test/mochitest/browser_net_response.js b/devtools/client/webconsole/old/net/test/mochitest/browser_net_response.js similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/browser_net_response.js rename to devtools/client/webconsole/old/net/test/mochitest/browser_net_response.js diff --git a/devtools/client/webconsole/net/test/mochitest/head.js b/devtools/client/webconsole/old/net/test/mochitest/head.js similarity index 99% rename from devtools/client/webconsole/net/test/mochitest/head.js rename to devtools/client/webconsole/old/net/test/mochitest/head.js index 6f1e5ecc2c84..adbd19242cc2 100644 --- a/devtools/client/webconsole/net/test/mochitest/head.js +++ b/devtools/client/webconsole/old/net/test/mochitest/head.js @@ -8,7 +8,7 @@ // Load Web Console head.js, it implements helper console test API Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/devtools/client/webconsole/test/head.js", this); + "chrome://mochitests/content/browser/devtools/client/webconsole/old/test/head.js", this); const NET_INFO_PREF = "devtools.webconsole.filter.networkinfo"; const NET_XHR_PREF = "devtools.webconsole.filter.netxhr"; diff --git a/devtools/client/webconsole/net/test/mochitest/page_basic.html b/devtools/client/webconsole/old/net/test/mochitest/page_basic.html similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/page_basic.html rename to devtools/client/webconsole/old/net/test/mochitest/page_basic.html diff --git a/devtools/client/webconsole/net/test/mochitest/test-cookies.json b/devtools/client/webconsole/old/net/test/mochitest/test-cookies.json similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test-cookies.json rename to devtools/client/webconsole/old/net/test/mochitest/test-cookies.json diff --git a/devtools/client/webconsole/net/test/mochitest/test-cookies.json^headers^ b/devtools/client/webconsole/old/net/test/mochitest/test-cookies.json^headers^ similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test-cookies.json^headers^ rename to devtools/client/webconsole/old/net/test/mochitest/test-cookies.json^headers^ diff --git a/devtools/client/webconsole/net/test/mochitest/test.json b/devtools/client/webconsole/old/net/test/mochitest/test.json similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test.json rename to devtools/client/webconsole/old/net/test/mochitest/test.json diff --git a/devtools/client/webconsole/net/test/mochitest/test.json^headers^ b/devtools/client/webconsole/old/net/test/mochitest/test.json^headers^ similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test.json^headers^ rename to devtools/client/webconsole/old/net/test/mochitest/test.json^headers^ diff --git a/devtools/client/webconsole/net/test/mochitest/test.txt b/devtools/client/webconsole/old/net/test/mochitest/test.txt similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test.txt rename to devtools/client/webconsole/old/net/test/mochitest/test.txt diff --git a/devtools/client/webconsole/net/test/mochitest/test.xml b/devtools/client/webconsole/old/net/test/mochitest/test.xml similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test.xml rename to devtools/client/webconsole/old/net/test/mochitest/test.xml diff --git a/devtools/client/webconsole/net/test/mochitest/test.xml^headers^ b/devtools/client/webconsole/old/net/test/mochitest/test.xml^headers^ similarity index 100% rename from devtools/client/webconsole/net/test/mochitest/test.xml^headers^ rename to devtools/client/webconsole/old/net/test/mochitest/test.xml^headers^ diff --git a/devtools/client/webconsole/net/test/unit/.eslintrc.js b/devtools/client/webconsole/old/net/test/unit/.eslintrc.js similarity index 64% rename from devtools/client/webconsole/net/test/unit/.eslintrc.js rename to devtools/client/webconsole/old/net/test/unit/.eslintrc.js index 54a9a6361b5c..4e1bf72a2b1b 100644 --- a/devtools/client/webconsole/net/test/unit/.eslintrc.js +++ b/devtools/client/webconsole/old/net/test/unit/.eslintrc.js @@ -2,5 +2,5 @@ module.exports = { // Extend from the common devtools xpcshell eslintrc config. - "extends": "../../../../../.eslintrc.xpcshell.js" + "extends": "../../../../../../.eslintrc.xpcshell.js" }; diff --git a/devtools/client/webconsole/net/test/unit/test_json-utils.js b/devtools/client/webconsole/old/net/test/unit/test_json-utils.js similarity index 93% rename from devtools/client/webconsole/net/test/unit/test_json-utils.js rename to devtools/client/webconsole/old/net/test/unit/test_json-utils.js index 635293ec0c32..b46929fc0e0b 100644 --- a/devtools/client/webconsole/net/test/unit/test_json-utils.js +++ b/devtools/client/webconsole/old/net/test/unit/test_json-utils.js @@ -6,7 +6,7 @@ "use strict"; const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {}); -const { parseJSONString, isJSON } = require("devtools/client/webconsole/net/utils/json"); +const { parseJSONString, isJSON } = require("devtools/client/webconsole/old/net/utils/json"); // Test data const simpleJson = '{"name":"John"}'; @@ -23,7 +23,7 @@ const jsonMimeType = "text/javascript"; const unknownMimeType = "text/unknown"; /** - * Testing API provided by webconsole/net/utils/json.js + * Testing API provided by webconsole/old/net/utils/json.js */ function run_test() { // parseJSONString diff --git a/devtools/client/webconsole/net/test/unit/test_net-utils.js b/devtools/client/webconsole/old/net/test/unit/test_net-utils.js similarity index 92% rename from devtools/client/webconsole/net/test/unit/test_net-utils.js rename to devtools/client/webconsole/old/net/test/unit/test_net-utils.js index 0d378a9e0d5e..215a1e0a31b6 100644 --- a/devtools/client/webconsole/net/test/unit/test_net-utils.js +++ b/devtools/client/webconsole/old/net/test/unit/test_net-utils.js @@ -12,7 +12,7 @@ const { getHeaderValue, isURLEncodedRequest, isMultiPartRequest -} = require("devtools/client/webconsole/net/utils/net"); +} = require("devtools/client/webconsole/old/net/utils/net"); // Test data const imageMimeTypes = ["image/jpeg", "image/jpg", "image/gif", @@ -51,7 +51,7 @@ const har3 = { }; /** - * Testing API provided by webconsole/net/utils/net.js + * Testing API provided by webconsole/old/net/utils/net.js */ function run_test() { // isImage diff --git a/devtools/client/webconsole/net/test/unit/xpcshell.ini b/devtools/client/webconsole/old/net/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/webconsole/net/test/unit/xpcshell.ini rename to devtools/client/webconsole/old/net/test/unit/xpcshell.ini diff --git a/devtools/client/webconsole/net/utils/events.js b/devtools/client/webconsole/old/net/utils/events.js similarity index 100% rename from devtools/client/webconsole/net/utils/events.js rename to devtools/client/webconsole/old/net/utils/events.js diff --git a/devtools/client/webconsole/net/utils/json.js b/devtools/client/webconsole/old/net/utils/json.js similarity index 100% rename from devtools/client/webconsole/net/utils/json.js rename to devtools/client/webconsole/old/net/utils/json.js diff --git a/devtools/client/webconsole/net/utils/moz.build b/devtools/client/webconsole/old/net/utils/moz.build similarity index 100% rename from devtools/client/webconsole/net/utils/moz.build rename to devtools/client/webconsole/old/net/utils/moz.build diff --git a/devtools/client/webconsole/net/utils/net.js b/devtools/client/webconsole/old/net/utils/net.js similarity index 100% rename from devtools/client/webconsole/net/utils/net.js rename to devtools/client/webconsole/old/net/utils/net.js diff --git a/devtools/client/webconsole/test/.eslintrc.js b/devtools/client/webconsole/old/test/.eslintrc.js similarity index 67% rename from devtools/client/webconsole/test/.eslintrc.js rename to devtools/client/webconsole/old/test/.eslintrc.js index 8d15a76d9b8c..698ae9181a0a 100644 --- a/devtools/client/webconsole/test/.eslintrc.js +++ b/devtools/client/webconsole/old/test/.eslintrc.js @@ -2,5 +2,5 @@ module.exports = { // Extend from the shared list of defined globals for mochitests. - "extends": "../../../.eslintrc.mochitests.js" + "extends": "../../../../.eslintrc.mochitests.js" }; diff --git a/devtools/client/webconsole/test/browser.ini b/devtools/client/webconsole/old/test/browser.ini similarity index 100% rename from devtools/client/webconsole/test/browser.ini rename to devtools/client/webconsole/old/test/browser.ini diff --git a/devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js b/devtools/client/webconsole/old/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js similarity index 98% rename from devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js rename to devtools/client/webconsole/old/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js index cfbf617959b5..27b678218ee8 100644 --- a/devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js +++ b/devtools/client/webconsole/old/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js @@ -10,7 +10,7 @@ const EXPECTED_RESULT = "Not supporting directive \u2018reflected-xss\u2019. " + "Directive and values will be ignored."; -const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test_bug1045902_console_csp_ignore_reflected_xss_" + "message.html"; diff --git a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js b/devtools/client/webconsole/old/test/browser_bug664688_sandbox_update_after_navigation.js similarity index 98% rename from devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js rename to devtools/client/webconsole/old/test/browser_bug664688_sandbox_update_after_navigation.js index 1aacb61c14b4..deb07afdcca1 100644 --- a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js +++ b/devtools/client/webconsole/old/test/browser_bug664688_sandbox_update_after_navigation.js @@ -10,9 +10,9 @@ "use strict"; add_task(function* () { - const TEST_URI1 = "http://example.com/browser/devtools/client/webconsole/" + + const TEST_URI1 = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; - const TEST_URI2 = "http://example.org/browser/devtools/client/webconsole/" + + const TEST_URI2 = "http://example.org/browser/devtools/client/webconsole/old/" + "test/test-console.html"; yield loadTab(TEST_URI1); diff --git a/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js b/devtools/client/webconsole/old/test/browser_bug_638949_copy_link_location.js similarity index 99% rename from devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js rename to devtools/client/webconsole/old/test/browser_bug_638949_copy_link_location.js index 2f943f7f81cb..503377c777db 100644 --- a/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js +++ b/devtools/client/webconsole/old/test/browser_bug_638949_copy_link_location.js @@ -9,7 +9,7 @@ "use strict"; add_task(function* () { - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html?_date=" + Date.now(); const COMMAND_NAME = "consoleCmd_copyURL"; const CONTEXT_MENU_ID = "#menu_copyURL"; diff --git a/devtools/client/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js b/devtools/client/webconsole/old/test/browser_bug_862916_console_dir_and_filter_off.js similarity index 100% rename from devtools/client/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js rename to devtools/client/webconsole/old/test/browser_bug_862916_console_dir_and_filter_off.js diff --git a/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js b/devtools/client/webconsole/old/test/browser_bug_865288_repeat_different_objects.js similarity index 99% rename from devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js rename to devtools/client/webconsole/old/test/browser_bug_865288_repeat_different_objects.js index 86ab5bd39203..06b8667a2fff 100644 --- a/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js +++ b/devtools/client/webconsole/old/test/browser_bug_865288_repeat_different_objects.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-repeated-messages.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js b/devtools/client/webconsole/old/test/browser_bug_865871_variables_view_close_on_esc_key.js similarity index 99% rename from devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js rename to devtools/client/webconsole/old/test/browser_bug_865871_variables_view_close_on_esc_key.js index 6b6d52607717..1fb3d9b63967 100644 --- a/devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js +++ b/devtools/client/webconsole/old/test/browser_bug_865871_variables_view_close_on_esc_key.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-eval-in-stackframe.html"; function test() { diff --git a/devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js b/devtools/client/webconsole/old/test/browser_bug_869003_inspect_cross_domain_object.js similarity index 99% rename from devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js rename to devtools/client/webconsole/old/test/browser_bug_869003_inspect_cross_domain_object.js index d6f4d1ff2ee3..f75620a1dc32 100644 --- a/devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js +++ b/devtools/client/webconsole/old/test/browser_bug_869003_inspect_cross_domain_object.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-869003-top-window.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_bug_871156_ctrlw_close_tab.js b/devtools/client/webconsole/old/test/browser_bug_871156_ctrlw_close_tab.js similarity index 100% rename from devtools/client/webconsole/test/browser_bug_871156_ctrlw_close_tab.js rename to devtools/client/webconsole/old/test/browser_bug_871156_ctrlw_close_tab.js diff --git a/devtools/client/webconsole/test/browser_cached_messages.js b/devtools/client/webconsole/old/test/browser_cached_messages.js similarity index 98% rename from devtools/client/webconsole/test/browser_cached_messages.js rename to devtools/client/webconsole/old/test/browser_cached_messages.js index bf69deee3fc2..6e3e994e6c1c 100644 --- a/devtools/client/webconsole/test/browser_cached_messages.js +++ b/devtools/client/webconsole/old/test/browser_cached_messages.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-webconsole-error-observer.html"; // On e10s, the exception is triggered in child process diff --git a/devtools/client/webconsole/test/browser_console.js b/devtools/client/webconsole/old/test/browser_console.js similarity index 98% rename from devtools/client/webconsole/test/browser_console.js rename to devtools/client/webconsole/old/test/browser_console.js index a0d0afcf9fbd..0362955028bc 100644 --- a/devtools/client/webconsole/test/browser_console.js +++ b/devtools/client/webconsole/old/test/browser_console.js @@ -7,14 +7,14 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html?" + Date.now(); const TEST_FILE = "chrome://mochitests/content/browser/devtools/client/" + - "webconsole/test/test-cu-reporterror.js"; + "webconsole/old/test/test-cu-reporterror.js"; const TEST_XHR_ERROR_URI = `http://example.com/404.html?${Date.now()}`; -const TEST_IMAGE = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_IMAGE = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-image.png"; const ObjectClient = require("devtools/shared/client/object-client"); diff --git a/devtools/client/webconsole/test/browser_console_certificate_imminent_distrust.js b/devtools/client/webconsole/old/test/browser_console_certificate_imminent_distrust.js similarity index 97% rename from devtools/client/webconsole/test/browser_console_certificate_imminent_distrust.js rename to devtools/client/webconsole/old/test/browser_console_certificate_imminent_distrust.js index 2728c4e80366..f287ecd057b5 100644 --- a/devtools/client/webconsole/test/browser_console_certificate_imminent_distrust.js +++ b/devtools/client/webconsole/old/test/browser_console_certificate_imminent_distrust.js @@ -17,7 +17,7 @@ const TEST_URI = "data:text/html;charset=utf8,Browser Console imminent " + "distrust warnings test"; -const TEST_URI_PATH = "/browser/devtools/client/webconsole/test/" + +const TEST_URI_PATH = "/browser/devtools/client/webconsole/old/test/" + "test-certificate-messages.html"; var gWebconsoleTests = [ diff --git a/devtools/client/webconsole/test/browser_console_clear_method.js b/devtools/client/webconsole/old/test/browser_console_clear_method.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_clear_method.js rename to devtools/client/webconsole/old/test/browser_console_clear_method.js diff --git a/devtools/client/webconsole/test/browser_console_clear_on_reload.js b/devtools/client/webconsole/old/test/browser_console_clear_on_reload.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_clear_on_reload.js rename to devtools/client/webconsole/old/test/browser_console_clear_on_reload.js index 223eb028d929..9c1526e70683 100644 --- a/devtools/client/webconsole/test/browser_console_clear_on_reload.js +++ b/devtools/client/webconsole/old/test/browser_console_clear_on_reload.js @@ -10,7 +10,7 @@ add_task(function* () { const PREF = "devtools.webconsole.persistlog"; - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; Services.prefs.setBoolPref(PREF, false); diff --git a/devtools/client/webconsole/test/browser_console_click_focus.js b/devtools/client/webconsole/old/test/browser_console_click_focus.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_click_focus.js rename to devtools/client/webconsole/old/test/browser_console_click_focus.js index f405f0bbf36d..5cb7121b1107 100644 --- a/devtools/client/webconsole/test/browser_console_click_focus.js +++ b/devtools/client/webconsole/old/test/browser_console_click_focus.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_console_consolejsm_output.js b/devtools/client/webconsole/old/test/browser_console_consolejsm_output.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_consolejsm_output.js rename to devtools/client/webconsole/old/test/browser_console_consolejsm_output.js diff --git a/devtools/client/webconsole/test/browser_console_copy_command.js b/devtools/client/webconsole/old/test/browser_console_copy_command.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_copy_command.js rename to devtools/client/webconsole/old/test/browser_console_copy_command.js diff --git a/devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js b/devtools/client/webconsole/old/test/browser_console_copy_entire_message_context_menu.js similarity index 98% rename from devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js rename to devtools/client/webconsole/old/test/browser_console_copy_entire_message_context_menu.js index bdd4f71793f2..f4c20a2e1ced 100644 --- a/devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js +++ b/devtools/client/webconsole/old/test/browser_console_copy_entire_message_context_menu.js @@ -15,7 +15,7 @@ add_task(function* () { let outputNode; let contextMenu; - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/test-console.html"; + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/test/test-console.html"; const { tab, browser } = yield loadTab(TEST_URI); hud = yield openConsole(tab); diff --git a/devtools/client/webconsole/test/browser_console_dead_objects.js b/devtools/client/webconsole/old/test/browser_console_dead_objects.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_dead_objects.js rename to devtools/client/webconsole/old/test/browser_console_dead_objects.js diff --git a/devtools/client/webconsole/test/browser_console_devtools_loader_exception.js b/devtools/client/webconsole/old/test/browser_console_devtools_loader_exception.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_devtools_loader_exception.js rename to devtools/client/webconsole/old/test/browser_console_devtools_loader_exception.js diff --git a/devtools/client/webconsole/test/browser_console_error_source_click.js b/devtools/client/webconsole/old/test/browser_console_error_source_click.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_error_source_click.js rename to devtools/client/webconsole/old/test/browser_console_error_source_click.js diff --git a/devtools/client/webconsole/test/browser_console_filters.js b/devtools/client/webconsole/old/test/browser_console_filters.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_filters.js rename to devtools/client/webconsole/old/test/browser_console_filters.js diff --git a/devtools/client/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js b/devtools/client/webconsole/old/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js rename to devtools/client/webconsole/old/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js diff --git a/devtools/client/webconsole/test/browser_console_history_persist.js b/devtools/client/webconsole/old/test/browser_console_history_persist.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_history_persist.js rename to devtools/client/webconsole/old/test/browser_console_history_persist.js diff --git a/devtools/client/webconsole/test/browser_console_iframe_messages.js b/devtools/client/webconsole/old/test/browser_console_iframe_messages.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_iframe_messages.js rename to devtools/client/webconsole/old/test/browser_console_iframe_messages.js index 9bf3fe2b7cca..ad94098c23c7 100644 --- a/devtools/client/webconsole/test/browser_console_iframe_messages.js +++ b/devtools/client/webconsole/old/test/browser_console_iframe_messages.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-consoleiframes.html"; const expectedMessages = [ diff --git a/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js b/devtools/client/webconsole/old/test/browser_console_keyboard_accessibility.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_keyboard_accessibility.js rename to devtools/client/webconsole/old/test/browser_console_keyboard_accessibility.js index 90f596cbdb7a..79a7830f9c82 100644 --- a/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js +++ b/devtools/client/webconsole/old/test/browser_console_keyboard_accessibility.js @@ -8,7 +8,7 @@ "use strict"; add_task(async function () { - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; await loadTab(TEST_URI); diff --git a/devtools/client/webconsole/test/browser_console_log_inspectable_object.js b/devtools/client/webconsole/old/test/browser_console_log_inspectable_object.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_log_inspectable_object.js rename to devtools/client/webconsole/old/test/browser_console_log_inspectable_object.js diff --git a/devtools/client/webconsole/test/browser_console_native_getters.js b/devtools/client/webconsole/old/test/browser_console_native_getters.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_native_getters.js rename to devtools/client/webconsole/old/test/browser_console_native_getters.js diff --git a/devtools/client/webconsole/test/browser_console_navigation_marker.js b/devtools/client/webconsole/old/test/browser_console_navigation_marker.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_navigation_marker.js rename to devtools/client/webconsole/old/test/browser_console_navigation_marker.js index e8ec84caf368..cedf767f297c 100644 --- a/devtools/client/webconsole/test/browser_console_navigation_marker.js +++ b/devtools/client/webconsole/old/test/browser_console_navigation_marker.js @@ -8,7 +8,7 @@ "use strict"; const PREF = "devtools.webconsole.persistlog"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; var hud; diff --git a/devtools/client/webconsole/test/browser_console_netlogging.js b/devtools/client/webconsole/old/test/browser_console_netlogging.js similarity index 95% rename from devtools/client/webconsole/test/browser_console_netlogging.js rename to devtools/client/webconsole/old/test/browser_console_netlogging.js index a3ca2d033428..2fb1f39f12c0 100644 --- a/devtools/client/webconsole/test/browser_console_netlogging.js +++ b/devtools/client/webconsole/old/test/browser_console_netlogging.js @@ -8,7 +8,7 @@ "use strict"; const TEST_NETWORK_REQUEST_URI = - "http://example.com/browser/devtools/client/webconsole/test/" + + "http://example.com/browser/devtools/client/webconsole/old/test/" + "test-network-request.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_console_nsiconsolemessage.js b/devtools/client/webconsole/old/test/browser_console_nsiconsolemessage.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_nsiconsolemessage.js rename to devtools/client/webconsole/old/test/browser_console_nsiconsolemessage.js diff --git a/devtools/client/webconsole/test/browser_console_open_or_focus.js b/devtools/client/webconsole/old/test/browser_console_open_or_focus.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_open_or_focus.js rename to devtools/client/webconsole/old/test/browser_console_open_or_focus.js diff --git a/devtools/client/webconsole/test/browser_console_optimized_out_vars.js b/devtools/client/webconsole/old/test/browser_console_optimized_out_vars.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_optimized_out_vars.js rename to devtools/client/webconsole/old/test/browser_console_optimized_out_vars.js index 3f4c978c8f41..b68bfafd76bd 100644 --- a/devtools/client/webconsole/test/browser_console_optimized_out_vars.js +++ b/devtools/client/webconsole/old/test/browser_console_optimized_out_vars.js @@ -16,7 +16,7 @@ registerCleanupFunction(function* () { function test() { Task.spawn(function* () { - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-closure-optimized-out.html"; let {tab} = yield loadTab(TEST_URI); let hud = yield openConsole(tab); diff --git a/devtools/client/webconsole/test/browser_console_private_browsing.js b/devtools/client/webconsole/old/test/browser_console_private_browsing.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_private_browsing.js rename to devtools/client/webconsole/old/test/browser_console_private_browsing.js diff --git a/devtools/client/webconsole/test/browser_console_restore.js b/devtools/client/webconsole/old/test/browser_console_restore.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_restore.js rename to devtools/client/webconsole/old/test/browser_console_restore.js diff --git a/devtools/client/webconsole/test/browser_console_server_logging.js b/devtools/client/webconsole/old/test/browser_console_server_logging.js similarity index 95% rename from devtools/client/webconsole/test/browser_console_server_logging.js rename to devtools/client/webconsole/old/test/browser_console_server_logging.js index e8ab58097789..5bd51f30b050 100644 --- a/devtools/client/webconsole/test/browser_console_server_logging.js +++ b/devtools/client/webconsole/old/test/browser_console_server_logging.js @@ -7,7 +7,7 @@ // Check that server log appears in the console panel - bug 1168872 add_task(function* () { - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/test-console-server-logging.sjs"; + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/test/test-console-server-logging.sjs"; yield loadTab(TEST_URI); @@ -37,7 +37,7 @@ add_task(function* () { }); add_task(function* () { - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/test-console-server-logging-array.sjs"; + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/test/test-console-server-logging-array.sjs"; yield loadTab(TEST_URI); @@ -66,7 +66,7 @@ add_task(function* () { }); add_task(function* () { - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/test-console-server-logging-backtrace.sjs"; + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/test/test-console-server-logging-backtrace.sjs"; yield loadTab(TEST_URI); diff --git a/devtools/client/webconsole/test/browser_console_variables_view.js b/devtools/client/webconsole/old/test/browser_console_variables_view.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_variables_view.js rename to devtools/client/webconsole/old/test/browser_console_variables_view.js index 9a2ac69d0271..8716bf60c7cf 100644 --- a/devtools/client/webconsole/test/browser_console_variables_view.js +++ b/devtools/client/webconsole/old/test/browser_console_variables_view.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-eval-in-stackframe.html"; var hud, gVariablesView; diff --git a/devtools/client/webconsole/test/browser_console_variables_view_dom_nodes.js b/devtools/client/webconsole/old/test/browser_console_variables_view_dom_nodes.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_variables_view_dom_nodes.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_dom_nodes.js diff --git a/devtools/client/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js b/devtools/client/webconsole/old/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js diff --git a/devtools/client/webconsole/test/browser_console_variables_view_filter.js b/devtools/client/webconsole/old/test/browser_console_variables_view_filter.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_variables_view_filter.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_filter.js diff --git a/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js b/devtools/client/webconsole/old/test/browser_console_variables_view_highlighter.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_variables_view_highlighter.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_highlighter.js index 95a7efb295d6..204533560368 100644 --- a/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js +++ b/devtools/client/webconsole/old/test/browser_console_variables_view_highlighter.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-952277-highlight-nodes-in-vview.html"; var gWebConsole, gJSTerm, gVariablesView, gToolbox; diff --git a/devtools/client/webconsole/test/browser_console_variables_view_special_names.js b/devtools/client/webconsole/old/test/browser_console_variables_view_special_names.js similarity index 100% rename from devtools/client/webconsole/test/browser_console_variables_view_special_names.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_special_names.js diff --git a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js b/devtools/client/webconsole/old/test/browser_console_variables_view_while_debugging.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_while_debugging.js index 551e1c1e7c72..daf7942bf8ee 100644 --- a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js +++ b/devtools/client/webconsole/old/test/browser_console_variables_view_while_debugging.js @@ -9,7 +9,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-eval-in-stackframe.html"; // Force the old debugger UI since it's directly used (see Bug 1301705) diff --git a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js b/devtools/client/webconsole/old/test/browser_console_variables_view_while_debugging_and_inspecting.js similarity index 99% rename from devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js rename to devtools/client/webconsole/old/test/browser_console_variables_view_while_debugging_and_inspecting.js index 97dc391a2a89..1672715888e0 100644 --- a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js +++ b/devtools/client/webconsole/old/test/browser_console_variables_view_while_debugging_and_inspecting.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-eval-in-stackframe.html"; // Force the old debugger UI since it's directly used (see Bug 1301705) diff --git a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js b/devtools/client/webconsole/old/test/browser_eval_in_debugger_stackframe.js similarity index 99% rename from devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js rename to devtools/client/webconsole/old/test/browser_eval_in_debugger_stackframe.js index bc923ff4495b..44772bc6b4ed 100644 --- a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js +++ b/devtools/client/webconsole/old/test/browser_eval_in_debugger_stackframe.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-eval-in-stackframe.html"; var gWebConsole, gJSTerm, gDebuggerWin, gThread, gDebuggerController; diff --git a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js b/devtools/client/webconsole/old/test/browser_eval_in_debugger_stackframe2.js similarity index 99% rename from devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js rename to devtools/client/webconsole/old/test/browser_eval_in_debugger_stackframe2.js index 1cccfd3c7496..8c6e9377664e 100644 --- a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js +++ b/devtools/client/webconsole/old/test/browser_eval_in_debugger_stackframe2.js @@ -9,7 +9,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-eval-in-stackframe.html"; // Force the old debugger UI since it's directly used (see Bug 1301705) diff --git a/devtools/client/webconsole/test/browser_jsterm_inspect.js b/devtools/client/webconsole/old/test/browser_jsterm_inspect.js similarity index 100% rename from devtools/client/webconsole/test/browser_jsterm_inspect.js rename to devtools/client/webconsole/old/test/browser_jsterm_inspect.js diff --git a/devtools/client/webconsole/test/browser_longstring_hang.js b/devtools/client/webconsole/old/test/browser_longstring_hang.js similarity index 98% rename from devtools/client/webconsole/test/browser_longstring_hang.js rename to devtools/client/webconsole/old/test/browser_longstring_hang.js index 036ad6e88170..1b1f2c66e896 100644 --- a/devtools/client/webconsole/test/browser_longstring_hang.js +++ b/devtools/client/webconsole/old/test/browser_longstring_hang.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-859170-longstring-hang.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js b/devtools/client/webconsole/old/test/browser_netmonitor_shows_reqs_in_webconsole.js similarity index 99% rename from devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js rename to devtools/client/webconsole/old/test/browser_netmonitor_shows_reqs_in_webconsole.js index ab92364ba5e9..4556a3e330cd 100644 --- a/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js +++ b/devtools/client/webconsole/old/test/browser_netmonitor_shows_reqs_in_webconsole.js @@ -10,7 +10,7 @@ const TEST_URI = "data:text/html;charset=utf8,Test that the netmonitor " + "web console, even if the netmonitor hadn't opened yet."; const TEST_FILE = "test-network-request.html"; -const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/old/" + "test/" + TEST_FILE; const NET_PREF = "devtools.webconsole.filter.networkinfo"; diff --git a/devtools/client/webconsole/test/browser_output_breaks_after_console_dir_uninspectable.js b/devtools/client/webconsole/old/test/browser_output_breaks_after_console_dir_uninspectable.js similarity index 100% rename from devtools/client/webconsole/test/browser_output_breaks_after_console_dir_uninspectable.js rename to devtools/client/webconsole/old/test/browser_output_breaks_after_console_dir_uninspectable.js diff --git a/devtools/client/webconsole/test/browser_output_longstring_expand.js b/devtools/client/webconsole/old/test/browser_output_longstring_expand.js similarity index 100% rename from devtools/client/webconsole/test/browser_output_longstring_expand.js rename to devtools/client/webconsole/old/test/browser_output_longstring_expand.js diff --git a/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js b/devtools/client/webconsole/old/test/browser_repeated_messages_accuracy.js similarity index 99% rename from devtools/client/webconsole/test/browser_repeated_messages_accuracy.js rename to devtools/client/webconsole/old/test/browser_repeated_messages_accuracy.js index 36b13ce02f43..702367d3d034 100644 --- a/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js +++ b/devtools/client/webconsole/old/test/browser_repeated_messages_accuracy.js @@ -9,7 +9,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-repeated-messages.html"; const PREF = "devtools.webconsole.persistlog"; diff --git a/devtools/client/webconsole/test/browser_result_format_as_string.js b/devtools/client/webconsole/old/test/browser_result_format_as_string.js similarity index 98% rename from devtools/client/webconsole/test/browser_result_format_as_string.js rename to devtools/client/webconsole/old/test/browser_result_format_as_string.js index 3fc0fb34f378..7791409bd750 100644 --- a/devtools/client/webconsole/test/browser_result_format_as_string.js +++ b/devtools/client/webconsole/old/test/browser_result_format_as_string.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-result-format-as-string.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js b/devtools/client/webconsole/old/test/browser_warn_user_about_replaced_api.js similarity index 95% rename from devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js rename to devtools/client/webconsole/old/test/browser_warn_user_about_replaced_api.js index 21a8435f875c..1b16232aa6b4 100644 --- a/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js +++ b/devtools/client/webconsole/old/test/browser_warn_user_about_replaced_api.js @@ -6,8 +6,8 @@ "use strict"; const TEST_REPLACED_API_URI = "http://example.com/browser/devtools/client/" + - "webconsole/test/test-console-replaced-api.html"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "webconsole/old/test/test-console-replaced-api.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/testscript.js"; const PREF = "devtools.webconsole.persistlog"; diff --git a/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/old/test/browser_webconsole_allow_mixedcontent_securityerrors.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js rename to devtools/client/webconsole/old/test/browser_webconsole_allow_mixedcontent_securityerrors.js index 3aaaef7ab3ae..707ac3f69ae4 100644 --- a/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_allow_mixedcontent_securityerrors.js @@ -13,7 +13,7 @@ "use strict"; -const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "https://example.com/browser/devtools/client/webconsole/old/" + "test/test-mixedcontent-securityerrors.html"; const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" + "Mixed_content" + DOCS_GA_PARAMS; diff --git a/devtools/client/webconsole/test/browser_webconsole_assert.js b/devtools/client/webconsole/old/test/browser_webconsole_assert.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_assert.js rename to devtools/client/webconsole/old/test/browser_webconsole_assert.js index 7fc9693f134f..a9901097d112 100644 --- a/devtools/client/webconsole/test/browser_webconsole_assert.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_assert.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console-assert.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js rename to devtools/client/webconsole/old/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_accessibility.js b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_accessibility.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_autocomplete_accessibility.js rename to devtools/client/webconsole/old/test/browser_webconsole_autocomplete_accessibility.js diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_and_selfxss.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js rename to devtools/client/webconsole/old/test/browser_webconsole_autocomplete_and_selfxss.js diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_crossdomain_iframe.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js rename to devtools/client/webconsole/old/test/browser_webconsole_autocomplete_crossdomain_iframe.js index 0e507e838f44..b03a3479cfb6 100644 --- a/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_crossdomain_iframe.js @@ -11,7 +11,7 @@ function test() { let hud; - const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-989025-iframe-parent.html"; Task.spawn(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_in_debugger_stackframe.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js rename to devtools/client/webconsole/old/test/browser_webconsole_autocomplete_in_debugger_stackframe.js index 60ba5ff0ebba..f6ac45127d7d 100644 --- a/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_in_debugger_stackframe.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-autocomplete-in-stackframe.html"; // Force the old debugger UI since it's directly used (see Bug 1301705) diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js b/devtools/client/webconsole/old/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js rename to devtools/client/webconsole/old/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js diff --git a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/old/test/browser_webconsole_block_mixedcontent_securityerrors.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js rename to devtools/client/webconsole/old/test/browser_webconsole_block_mixedcontent_securityerrors.js index 019ebe824900..9a803e3d930a 100644 --- a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_block_mixedcontent_securityerrors.js @@ -16,7 +16,7 @@ "use strict"; -const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "https://example.com/browser/devtools/client/webconsole/old/" + "test/test-mixedcontent-securityerrors.html"; const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" + "Mixed_content" + DOCS_GA_PARAMS; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_1010953_cspro.js similarity index 96% rename from devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_1010953_cspro.js index 5c5c8ea6d7d5..dfd80ae30337 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_1010953_cspro.js @@ -19,7 +19,7 @@ CSP_REPORT_MSG are confirmed to be found in the console messages. const TEST_URI = "data:text/html;charset=utf8,Web Console CSP report only " + "test (bug 1010953)"; const TEST_VIOLATION = "http://example.com/browser/devtools/client/" + - "webconsole/test/test_bug_1010953_cspro.html"; + "webconsole/old/test/test_bug_1010953_cspro.html"; const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings " + "blocked the loading of a resource at " + "http://some.example.com/test.png " + diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_1050691_click_function_to_source.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_1050691_click_function_to_source.js index 9b220b4a24fa..d5800204f762 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_1050691_click_function_to_source.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug_1050691_click_function_to_source.html"; // Force the old debugger UI since it's directly used (see Bug 1301705) diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_1247459_violation.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_1247459_violation.js similarity index 93% rename from devtools/client/webconsole/test/browser_webconsole_bug_1247459_violation.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_1247459_violation.js index 5c20dd2ad432..4d0176ff68f4 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_1247459_violation.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_1247459_violation.js @@ -10,7 +10,7 @@ const TEST_URI = "data:text/html;charset=utf8,Web Console CSP violation test"; const TEST_VIOLATION = "https://example.com/browser/devtools/client/" + - "webconsole/test/test_bug_1247459_violation.html"; + "webconsole/old/test/test_bug_1247459_violation.html"; const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings " + "blocked the loading of a resource at " + "http://some.example.com/test.png (\u201cimg-src\u201d)."; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_578437_page_reload.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_578437_page_reload.js index e16af7ec4f8c..a3f71cfbf802 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_578437_page_reload.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; var browser; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_579412_input_focus.js similarity index 97% rename from devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_579412_input_focus.js index 551dbd361b1e..235930733cbc 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_579412_input_focus.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_580001_closing_after_completion.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_580001_closing_after_completion.js index b3b021b2d5b9..631166f76af1 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_580001_closing_after_completion.js @@ -8,7 +8,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_580030_errors_after_page_reload.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_580030_errors_after_page_reload.js index 81b96c4d4506..58ddbabb75bd 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_580030_errors_after_page_reload.js @@ -9,7 +9,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-error.html"; function test() { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_582201_duplicate_errors.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_582201_duplicate_errors.js index 00d8df405fb2..f3dd85eeb6eb 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_582201_duplicate_errors.js @@ -9,7 +9,7 @@ "use strict"; const INIT_URI = "data:text/html;charset=utf8,hello world"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-duplicate-error.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js index e0e4f2bdda41..95bf760fbb3f 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/browser/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_585237_line_limit.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_585237_line_limit.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_585237_line_limit.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_585237_line_limit.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_585956_console_trace.js similarity index 95% rename from devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_585956_console_trace.js index d5c6022dd72f..21230f067576 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_585956_console_trace.js @@ -6,7 +6,7 @@ "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/" + - "webconsole/test/test-bug-585956-console-trace.html"; + "webconsole/old/test/test-bug-585956-console-trace.html"; add_task(function* () { let {tab} = yield loadTab("data:text/html;charset=utf8,

hello"); diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_585991_autocomplete_keys.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_585991_autocomplete_keys.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_585991_autocomplete_popup.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_585991_autocomplete_popup.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_586388_select_all.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_586388_select_all.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_586388_select_all.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_586388_select_all.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_587617_output_copy.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_587617_output_copy.js index 069b4e7f408f..af1981202f9e 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_587617_output_copy.js @@ -6,7 +6,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; var HUD, outputNode; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_588342_document_focus.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_588342_document_focus.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_588342_document_focus.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_588342_document_focus.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_588730_text_node_insertion.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_588730_text_node_insertion.js index a5089e937727..7a8d509dcf4b 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_588730_text_node_insertion.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_588967_input_expansion.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_588967_input_expansion.js index 36a9db4c1813..43822c8b34ef 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_588967_input_expansion.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_589162_css_filter.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_589162_css_filter.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_589162_css_filter.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_589162_css_filter.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_592442_closing_brackets.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_592442_closing_brackets.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_593003_iframe_wrong_hud.js similarity index 91% rename from devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_593003_iframe_wrong_hud.js index 9f429a3d17fa..33138641e830 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_593003_iframe_wrong_hud.js @@ -5,15 +5,15 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-593003-iframe-wrong-hud.html"; const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/" + - "webconsole/test/test-bug-593003-iframe-wrong-" + + "webconsole/old/test/test-bug-593003-iframe-wrong-" + "hud-iframe.html"; const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/" + - "webconsole/test/test-console.html"; + "webconsole/old/test/test-console.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_594497_history_arrow_keys.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_594497_history_arrow_keys.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_595223_file_uri.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_595223_file_uri.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_595934_message_categories.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_595934_message_categories.js index 689c94841460..87d2ef2837b0 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_595934_message_categories.js @@ -7,7 +7,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " + "bug 595934 - message categories coverage."; -const TESTS_PATH = "http://example.com/browser/devtools/client/webconsole/" + +const TESTS_PATH = "http://example.com/browser/devtools/client/webconsole/old/" + "test/"; const TESTS = [ { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js index 32ac8b7eebff..788cb68f5904 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-console.html"; var tab1, tab2, win1, win2; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_597136_external_script_errors.js similarity index 92% rename from devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_597136_external_script_errors.js index 336700adaed2..8ae4d3d41c99 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_597136_external_script_errors.js @@ -6,7 +6,7 @@ "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/" + - "webconsole/test/test-bug-597136-external-script-" + + "webconsole/old/test/test-bug-597136-external-script-" + "errors.html"; function test() { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_597136_network_requests_from_chrome.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_597136_network_requests_from_chrome.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_597460_filter_scroll.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_597460_filter_scroll.js index 77993ecd45cb..4b8ef005803a 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_597460_filter_scroll.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-network.html"; const PREF = "devtools.webconsole.persistlog"; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_597756_reopen_closed_tab.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_597756_reopen_closed_tab.js index 5a8280eed911..94ea37e6c1d0 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_597756_reopen_closed_tab.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-597756-reopen-closed-tab.html"; var HUD; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_599725_response_headers.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_599725_response_headers.js index 5dc9aba402e7..8c213d59cf9a 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_599725_response_headers.js @@ -6,7 +6,7 @@ "use strict"; const INIT_URI = "data:text/plain;charset=utf8,hello world"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-599725-response-headers.sjs"; function performTest(request, hud) { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_600183_charset.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_600183_charset.js index 9d9c067dbc4f..079a995015bf 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_600183_charset.js @@ -6,7 +6,7 @@ "use strict"; const INIT_URI = "data:text/html;charset=utf-8,Web Console - bug 600183 test"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-600183-charset.html"; function performTest(lastFinishedRequest, console) { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_601177_log_levels.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_601177_log_levels.js index 9dd81c9fd706..a2c136219559 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_601177_log_levels.js @@ -7,7 +7,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " + "bug 601177: log levels"; -const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-601177-log-levels.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_601352_scroll.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_601352_scroll.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_601352_scroll.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_601352_scroll.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_601667_filter_buttons.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_601667_filter_buttons.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_603750_websocket.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_603750_websocket.js index f14530d06b06..d4c461e2f370 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_603750_websocket.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-603750-websocket.html"; const TEST_URI2 = "data:text/html;charset=utf-8,Web Console test for " + "bug 603750: Web Socket errors"; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_611795.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_611795.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_611795.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_611795.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_613013_console_api_iframe.js similarity index 97% rename from devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_613013_console_api_iframe.js index 5d006795807a..e444712a80ce 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_613013_console_api_iframe.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-613013-console-api-iframe.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_613280_jsterm_copy.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_613280_jsterm_copy.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_613642_maintain_scroll.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_613642_maintain_scroll.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_613642_prune_scroll.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_613642_prune_scroll.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_613642_prune_scroll.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_613642_prune_scroll.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_614793_jsterm_scroll.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_614793_jsterm_scroll.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_618078_network_exceptions.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_618078_network_exceptions.js index 439793b22308..d6aa14cc29f4 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_618078_network_exceptions.js @@ -9,7 +9,7 @@ "use strict"; const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 618078"; -const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-618078-network-exceptions.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_621644_jsterm_dollar.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_621644_jsterm_dollar.js index 31b882e2c594..151437da08ac 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_621644_jsterm_dollar.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-621644-jsterm-dollar.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_622303_persistent_filters.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_622303_persistent_filters.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_630733_response_redirect_headers.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_630733_response_redirect_headers.js index f6bd9d26aba3..74803480fba8 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_630733_response_redirect_headers.js @@ -7,7 +7,7 @@ const TEST_URI = "data:text/html;charset=utf-8,

Web Console test for " + "bug 630733"; -const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-630733-response-redirect-headers.sjs"; var lastFinishedRequests = {}; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_632275_getters_document_width.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_632275_getters_document_width.js index 073164431672..4f9b1fd2d06d 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_632275_getters_document_width.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-632275-getters.html"; var getterValue = null; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_632347_iterators_generators.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_632347_iterators_generators.js index 59059386d69f..ee9cff969638 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_632347_iterators_generators.js @@ -5,7 +5,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-632347-iterators-generators.html"; function test() { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_632817.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_632817.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_632817.js index b2fffc6e13cf..4d0265582ebe 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_632817.js @@ -8,10 +8,10 @@ "use strict"; const TEST_NETWORK_REQUEST_URI = - "https://example.com/browser/devtools/client/webconsole/test/" + + "https://example.com/browser/devtools/client/webconsole/old/test/" + "test-network-request.html"; -const TEST_IMG = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_IMG = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-image.png"; const TEST_DATA_JSON_CONTENT = diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_642108_pruneTest.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_642108_pruneTest.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_642108_pruneTest.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_642108_pruneTest.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_644419_log_limits.js similarity index 98% rename from devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_644419_log_limits.js index 8ad10db9d69d..afa6c1d8b297 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_644419_log_limits.js @@ -13,7 +13,7 @@ const INIT_URI = "data:text/html;charset=utf-8,Web Console test for " + "have user-settable log limits for each message category"; const TEST_URI = "http://example.com/browser/devtools/client/" + - "webconsole/test/test-bug-644419-log-limits.html"; + "webconsole/old/test/test-bug-644419-log-limits.html"; var hud, outputNode; diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_646025_console_file_location.js similarity index 97% rename from devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_646025_console_file_location.js index 81573e56fe0d..748ad14b868a 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_646025_console_file_location.js @@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console file location " + "display test"; const TEST_URI2 = "http://example.com/browser/devtools/client/" + - "webconsole/test/" + + "webconsole/old/test/" + "test-bug-646025-console-file-location.html"; add_task(function* () { diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_651501_document_body_autocomplete.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_651501_document_body_autocomplete.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_653531_highlighter_console_helper.js similarity index 100% rename from devtools/client/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_653531_highlighter_console_helper.js diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js b/devtools/client/webconsole/old/test/browser_webconsole_bug_658368_time_methods.js similarity index 99% rename from devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js rename to devtools/client/webconsole/old/test/browser_webconsole_bug_658368_time_methods.js index 2c6c933fc7da..c0a7786f3935 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js +++ b/devtools/client/webconsole/old/test/browser_webconsole_bug_658368_time_methods.js @@ -7,7 +7,7 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/old/" + "test/test-bug-658368-time-methods.html"; const TEST_URI2 = "data:text/html;charset=utf-8, -#include ../../../toolkit/content/editMenuCommands.inc.xul +#include ../../../../toolkit/content/editMenuCommands.inc.xul -#include ../../../toolkit/content/editMenuKeys.inc.xul +#include ../../../../toolkit/content/editMenuKeys.inc.xul diff --git a/devtools/docs/tools/http-inspector.md b/devtools/docs/tools/http-inspector.md index 53908fd7639a..f4d421e857c6 100644 --- a/devtools/docs/tools/http-inspector.md +++ b/devtools/docs/tools/http-inspector.md @@ -13,7 +13,7 @@ as well as in the Browser Console (for devtools and extension developers)._ The current implementation is based on React (no XUL) and some of the existing components should also be used when porting the Network panel to HTML. -The entire feature lives in `devtools/client/webconsole/net` directory. +The entire feature lives in `devtools/client/webconsole/old/net` directory. ## General Description The entry point for HTTP log inspection is represented by an expand/toggle @@ -23,7 +23,7 @@ button displayed in front a log in the Console panel: Clicking on the [+] button expands the log and shows a body with HTTP details right underneath. The info body is rendered by: -`devtools/client/webconsole/net/components/net-info-body` component. +`devtools/client/webconsole/old/net/components/net-info-body` component. HTTP info is divided into several tabs: @@ -34,7 +34,7 @@ HTTP info is divided into several tabs: * Cookies: Sent and received cookies ### Headers Tab -`devtools/client/webconsole/net/components/headers-tab` +`devtools/client/webconsole/old/net/components/headers-tab` This is the default active tab and it's responsible for rendering HTTP headers. There are several header groups displayed: @@ -49,7 +49,7 @@ Rendering of the groups is done by `NetInfoGroup` and `NetInfoGroupList` components. ### Params Tab -`devtools/client/webconsole/net/components/params-tab` +`devtools/client/webconsole/old/net/components/params-tab` This tab is responsible for rendering URL parameters (query string) and it's available only if the URL has any parameters. Individual @@ -58,12 +58,12 @@ parameters are parsed and displayed as a list of name/value pairs. Rendering of the parameter list is done by `NetInfoParams` component. ### Post Tab -`devtools/client/webconsole/net/components/post-tab` +`devtools/client/webconsole/old/net/components/post-tab` This tab is responsible for rendering HTTP post body sent to the server. ### Response Tab -`devtools/client/webconsole/net/components/response-tab` +`devtools/client/webconsole/old/net/components/response-tab` This tab is responsible for rendering HTTP response body received from the server. There might be more than one section displaying the data @@ -78,9 +78,9 @@ The response is decoded and displayed as an image. * XML: this section is available in case of HTML/XML responses [3] The response is parsed using DOM parser and displayed as an XML markup. -[1] List of JSON mime-types: `devtools/client/webconsole/net/utils/json` -[2] List of Image mime-types: `devtools/client/webconsole/net/utils/json` -[3] List of XML/HTML mime-types: `devtools/client/webconsole/net/utils/net` +[1] List of JSON mime-types: `devtools/client/webconsole/old/net/utils/json` +[2] List of Image mime-types: `devtools/client/webconsole/old/net/utils/json` +[3] List of XML/HTML mime-types: `devtools/client/webconsole/old/net/utils/net` Response data are fetched using `LongStringClient`, so if data are bigger than defined limit (see `devtools/server/main.js - LONG_STRING_LENGTH) @@ -91,7 +91,7 @@ The raw section is collapsed by default if there is another presentation of the data. ### Cookies Tab -`devtools/client/webconsole/net/components/cookies-tab` +`devtools/client/webconsole/old/net/components/cookies-tab` This tab is responsible for displaying HTTP cookies. There are two groups: @@ -106,7 +106,7 @@ components. The tab is not presented if there are no cookies. This sections describes internal architecture of HTTPi feature. ### Main -`devtools/client/webconsole/net/main` +`devtools/client/webconsole/old/net/main` This is the main module of HTTPi. It represents the root module of the feature. @@ -116,7 +116,7 @@ from webconsole.js. This modules creates one instance of `NetRequest` object for every `NetworkEvent` (one object for every HTTP request). ### NetRequest -`devtools/client/webconsole/net/net-request` +`devtools/client/webconsole/old/net/net-request` This module represents `NetRequest` object. It's the internal representation of HTTP request and it keeps its state. All HTTP details fetched dynamically @@ -133,12 +133,12 @@ requesting HTTP details. `DataProvider` is the connection between `NetRequest` and the backend. ### Data Provider -`devtools/client/webconsole/net/data-provider` +`devtools/client/webconsole/old/net/data-provider` This module is using webconsole client object to get data from the backend. ### Utils -`devtools/client/webconsole/net/utils` +`devtools/client/webconsole/old/net/utils` There are also some utility modules implementing helper functions. The important thing is that these modules doesn't require any chrome