diff --git a/.eslintignore b/.eslintignore index 7f8640605124..202c7b28e5a7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -142,7 +142,7 @@ devtools/client/storage/test/*.html !devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html devtools/client/webaudioeditor/** devtools/client/webconsole/net/** -devtools/client/webconsole/new-console-output/test/mochitest/** +!devtools/client/webconsole/new-console-output/test/mochitest/** devtools/client/webconsole/test/** devtools/client/webconsole/webconsole-connection-proxy.js devtools/client/webconsole/webconsole.js diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_addonsdk_loader_exception.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_addonsdk_loader_exception.js index 5214d9849e07..c9607ca6a40e 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_addonsdk_loader_exception.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_addonsdk_loader_exception.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that exceptions from scripts loaded with the addon-sdk loader are // opened correctly in View Source from the Browser Console. // See bug 866950. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js index 33b43850e4df..d4e01b445d27 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that console.clear() does not clear the output of the browser console. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js index 3d62cad76b7a..d774ac4810d1 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js @@ -6,7 +6,7 @@ // Check that we display the expected context menu entries. const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-console.html"; + "new-console-output/test/mochitest/test-console.html"; add_task(async function () { // Enable net messages in the console for this test. @@ -64,6 +64,6 @@ function getSimplifiedContextMenu(popupElement) { .map(entry => { const key = entry.getAttribute("accesskey"); const disabled = entry.hasAttribute("disabled"); - return `#${entry.id} (${key})${disabled ? " [disabled]": ""}` + return `#${entry.id} (${key})${disabled ? " [disabled]" : ""}`; }); } diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js index cd38f5a8ea4e..64d027563634 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js @@ -6,10 +6,9 @@ "use strict"; +const TEST_URI = `data:text/html,console API calls`; -const TEST_URI = `data:text/html,console API calls` - -add_task(async function() { +add_task(async function () { await addTab(TEST_URI); const hud = await HUDService.toggleBrowserConsole(); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js index 382066b8952f..48e2514d2518 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Bug 874061: test for how the browser and web consoles display messages coming // from private windows. See bug for description of expected behavior. @@ -24,8 +26,9 @@ function test() { start(); function start() { - gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, "data:text/html;charset=utf8," + - "

hello world! I am not private!"); + gBrowser.selectedTab = + BrowserTestUtils.addTab(gBrowser, "data:text/html;charset=utf8," + + "

hello world! I am not private!"); gBrowser.selectedBrowser.addEventListener("load", onLoadTab, true); } diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js index 8d4c3ef43af9..b6468af128fc 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the autocomplete input is being blurred and focused when selecting a value. // This will help screen-readers notify users of the value that was set in the input. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js index 5994c54ad517..a8553ff76022 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that user input that is not submitted in the command line input is not // lost after navigating in history. // See https://bugzilla.mozilla.org/show_bug.cgi?id=817834 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js index 63f9908a8bb1..62402cb1e60f 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js @@ -19,9 +19,7 @@ add_task(async function () { let { jsterm } = await openNewTabAndConsole(TEST_URI); const { - autocompletePopup: popup, - completeNode, - inputNode, + autocompletePopup: popup } = jsterm; let onPopUpOpen = popup.once("popup-opened"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js index 2a0574abd8d1..4b81a474652e 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the cached autocomplete results are used when the new // user input is a subset of the existing completion results. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js index 364427ebc793..b024368f3a47 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js @@ -1,6 +1,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that autocomplete doesn't break when trying to reach into objects from // a different domain. See Bug 989025. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js index db1c84396f56..805e1fa62af1 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js @@ -29,7 +29,6 @@ add_task(async function () { const { autocompletePopup: popup, completeNode, - inputNode, } = jsterm; let onPopUpOpen = popup.once("popup-opened"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js index 02fa1c70f88b..674741d96cfe 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that, when the user types an extraneous closing bracket, no error // appears. See Bug 592442. @@ -17,6 +19,6 @@ add_task(async function () { await jstermSetValueAndComplete(jsterm, "document.getElementById)"); ok(true, "no error was thrown when an extraneous bracket was inserted"); } catch (ex) { - ok(false, "an error was thrown when an extraneous bracket was inserted") + ok(false, "an error was thrown when an extraneous bracket was inserted"); } }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js index fae3da303fcc..08ca97c1ef5d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js @@ -3,12 +3,13 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the autocompletion results contain the names of JSTerm helpers. // See Bug 686937. "use strict"; - const TEST_URI = "data:text/html;charset=utf8,

test JSTerm Helpers autocomplete"; add_task(async function () { @@ -34,4 +35,4 @@ function complete(jsterm) { function getPopupItemsLabel(popup) { return popup.getItems().map(item => item.label); -} \ No newline at end of file +} diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js index 6c0a42afb94a..a253d52136b5 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that code completion works properly in chrome tabs, like about:config. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js index 1e89cd4ace16..a4bad09205d5 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that makes sure web console autocomplete happens in the user-selected // stackframe from the js debugger. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js index b54f99c763b7..fc166287c192 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that native getters (e.g. document.body) autocompletes in the web console. // See Bug 651501. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js index 663698ee84ce..5c4b2bfadc07 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js @@ -31,7 +31,6 @@ add_task(async function () { const { autocompletePopup: popup, completeNode, - inputNode, } = jsterm; ok(!popup.isOpen, "popup is not open"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js index f3a12f43ac24..0db5eb2e8fec 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js @@ -34,7 +34,6 @@ add_task(async function () { const { autocompletePopup: popup, completeNode, - inputNode, } = jsterm; let onPopUpOpen = popup.once("popup-opened"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js index a2d0aaef6c7a..0cfaff2ddcf8 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js @@ -21,7 +21,6 @@ add_task(async function () { const { autocompletePopup: popup, completeNode, - inputNode, } = jsterm; const onPopUpOpen = popup.once("popup-opened"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js index 5910d84bf9c9..1695431af120 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that code completion works properly. "use strict"; @@ -27,7 +29,8 @@ add_task(async function () { // Test typing 'window.Ob' and press tab. Just 'window.O' is // ambiguous: could be window.Object, window.Option, etc. - await jstermSetValueAndComplete(jsterm, "window.Ob", undefined, jsterm.COMPLETE_FORWARD); + await jstermSetValueAndComplete(jsterm, "window.Ob", undefined, + jsterm.COMPLETE_FORWARD); is(input.value, "window.Object", "'window.Ob' tab completion"); // Test typing 'document.getElem'. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js index b7b403948a2b..ccee12c5e3fd 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the `copy` console helper works as intended. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js index cb780f644bb0..44a2cf10450d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Map Control + A to Select All, In the web console input /* import-globals-from head.js */ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js index 48de7c3e3210..f1487b379afb 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test navigation of webconsole contents via ctrl-a, ctrl-e, ctrl-p, ctrl-n // see https://bugzilla.mozilla.org/show_bug.cgi?id=804845 // diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js index c10562419751..8109dbc42af6 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js @@ -23,7 +23,7 @@ add_task(async function () { let title = ErrorDocs.GetURL({ errorMessageName }).split("?")[0]; jsterm.clearOutput(); - const onMessage = waitForMessage(hud, "RangeError:") + const onMessage = waitForMessage(hud, "RangeError:"); jsterm.execute(expression); const {node} = await onMessage; const learnMoreLink = node.querySelector(".learn-more-link"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js index a86b82c8fb09..56693ba6dcee 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests the console history feature accessed via the up and down arrow keys. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js index 71e0f41d3e32..28c37b32c15f 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that console command input is persisted across toolbox loads. // See Bug 943306. @@ -14,7 +16,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " + "persisting history - bug 943306"; const INPUT_HISTORY_COUNT = 10; -add_task(async function() { +add_task(async function () { info("Setting custom input history pref to " + INPUT_HISTORY_COUNT); Services.prefs.setIntPref("devtools.webconsole.inputHistoryCount", INPUT_HISTORY_COUNT); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js index 39a32f6f7263..31ecd87546a9 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that the inspect() jsterm helper function works. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js index 17420a49b7fa..7264103e61e3 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js @@ -9,7 +9,7 @@ const TEST_URI = "data:text/html,Testing jsterm with no input"; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); testCompletion(hud); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js index fd13f63a206e..11f53080ed75 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js @@ -9,7 +9,7 @@ const TEST_URI = "data:text/html,Testing jsterm focus"; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); let jsterm = hud.jsterm; let input = jsterm.inputNode; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js index 8a9b6e1a5eb1..e0be30b438c3 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the autocomplete popup closes on switching tabs. See bug 900448. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js index fa1d7d9d5697..451914b1188d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // The test loads a web page with mixed active and display content // on it while the "block mixed content" settings are _off_. // It then checks that the loading mixed content warning messages @@ -14,9 +16,10 @@ "use strict"; const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-mixedcontent-securityerrors.html"; -const LEARN_MORE_URI = - "https://developer.mozilla.org/docs/Web/Security/Mixed_content" + DOCS_GA_PARAMS; + "new-console-output/test/mochitest/" + + "test-mixedcontent-securityerrors.html"; +const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" + + "Mixed_content" + DOCS_GA_PARAMS; add_task(async function () { await Promise.all([ @@ -47,7 +50,7 @@ add_task(async function () { const checkLink = ({ link, where, expectedLink, expectedTab }) => { is(link, expectedLink, `Clicking the provided link opens ${link}`); is(where, expectedTab, `Clicking the provided link opens in expected tab`); - } + }; info("Clicking on the Learn More link"); const learnMoreLink = mixedActiveContentMessage.querySelector(".learn-more-link"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js index 5872d6b98a3d..2afb54687a1a 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js @@ -7,10 +7,11 @@ // Check adding console calls as batch keep the order of the message. -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-batching.html"; const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages"); -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); const messageNumber = 100; await testSimpleBatchLogging(hud, messageNumber); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js index b4e427870120..4e286bf1080b 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // The test loads a web page with mixed active and display content // on it while the "block mixed content" settings are _on_. // It then checks that the blocked mixed content warning messages @@ -17,9 +19,10 @@ "use strict"; const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-mixedcontent-securityerrors.html"; -const LEARN_MORE_URI = - "https://developer.mozilla.org/docs/Web/Security/Mixed_content" + DOCS_GA_PARAMS; + "new-console-output/test/mochitest/" + + "test-mixedcontent-securityerrors.html"; +const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" + + "Mixed_content" + DOCS_GA_PARAMS; const blockedActiveContentText = "Blocked loading mixed active content " + "\u201chttp://example.com/\u201d"; @@ -28,9 +31,10 @@ const blockedDisplayContentText = "Blocked loading mixed display content " + const activeContentText = "Loading mixed (insecure) active content " + "\u201chttp://example.com/\u201d on a secure page"; const displayContentText = "Loading mixed (insecure) display content " + - "\u201chttp://example.com/tests/image/test/mochitest/blue.png\u201d on a secure page"; + "\u201chttp://example.com/tests/image/test/mochitest/blue.png\u201d on a " + + "secure page"; -add_task(async function() { +add_task(async function () { await pushPrefEnv(); const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js index 1e791e7ad645..3dc6d14c3c7e 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js @@ -3,15 +3,18 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test to see if the cached messages are displayed when the console UI is // opened. "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-webconsole-error-observer.html"; + "new-console-output/test/mochitest/" + + "test-webconsole-error-observer.html"; -add_task(async function() { +add_task(async function () { // On e10s, the exception is triggered in child process // and is ignored by test harness if (!Services.appinfo.browserTabsRemoteAutostart) { diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js index 3d7965234df6..59cb5ace9fa9 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js @@ -3,12 +3,14 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the cd() jsterm helper function works as expected. See bug 609872. "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-cd-iframe-parent.html"; + "new-console-output/test/mochitest/test-cd-iframe-parent.html"; add_task(async function () { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js index 2517cc4483a2..eb243480cb8a 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the Web Console shows weak crypto warnings (SHA-1 Certificate) "use strict"; @@ -15,9 +17,6 @@ const SHA1_URL = "https://sha1ee.example.com" + TEST_URI_PATH; const SHA256_URL = "https://sha256ee.example.com" + TEST_URI_PATH; const TRIGGER_MSG = "If you haven't seen ssl warnings yet, you won't"; -const cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"] - .getService(Ci.nsICacheStorageService); - add_task(async function () { const hud = await openNewTabAndConsole(TEST_URI); @@ -41,5 +40,5 @@ add_task(async function () { ok(!textContent.includes("SSL 3.0"), "There is no warning message for SSL 3.0"); ok(!textContent.includes("RC4"), "There is no warning message for RC4"); - cache.clear(); + Services.cache2.clear(); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js index 1263de93994c..41e6db2e7ffd 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js @@ -3,12 +3,15 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that clicking on a function displays its source in the debugger. See Bug 1050691. "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-click-function-to-source.html"; + "new-console-output/test/mochitest/" + + "test-click-function-to-source.html"; // Force the old debugger UI since it's directly used (see Bug 1301705) pushPref("devtools.debugger.new-debugger-frontend", false); @@ -20,16 +23,16 @@ add_task(async function () { const {panel} = await openDebugger(); let panelWin = panel.panelWin; - info("And right after come back to the Console panel.") + info("And right after come back to the Console panel."); await openConsole(); info("Log a function"); - const onLoggedFunction = waitForMessage(hud, "function foo") + const onLoggedFunction = waitForMessage(hud, "function foo"); ContentTask.spawn(gBrowser.selectedBrowser, {}, function () { content.wrappedJSObject.foo(); }); const {node} = await onLoggedFunction; - const jumpIcon = node.querySelector(".jump-definition") + const jumpIcon = node.querySelector(".jump-definition"); ok(jumpIcon, "A jump to definition button is rendered, as expected"); info("Click on the jump to definition button."); @@ -40,5 +43,6 @@ add_task(async function () { const {editor} = panelWin.DebuggerView; const {line, ch} = editor.getCursor(); // Source editor starts counting line and column numbers from 0. - ok(line === 6 && ch === 0, "Debugger is open at the expected position"); + is(line, 8, "Debugger is open at the expected line"); + is(ch, 0, "Debugger is open at the expected character"); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js index 47a8ca19d6fe..c9a93c1bbb1b 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js @@ -1,6 +1,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // When strings containing URLs are entered into the webconsole, // ensure that the output can be clicked to open those URLs. // This test only check that clicking on a link works as expected, diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js index 7035f8271667..4e9cd4651bb6 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the sidebar is hidden for all methods of closing it. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js index ce83e5737850..6fb1837a8e77 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests to ensure that errors don't appear when the console is closed while a // completion is being performed. See Bug 580001. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js index 4de3682cab28..237ad9318c7b 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js @@ -38,7 +38,8 @@ function test() { let deferred = defer(); fetchScopes(hud, toolbox, panelWin, deferred); - ContentTask.spawn(gBrowser.selectedBrowser, {}, function* () { + // eslint-disable-next-line + ContentTask.spawn(gBrowser.selectedBrowser, {}, () => { let button = content.document.querySelector("button"); ok(button, "button element found"); button.click(); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js index fb00b81ed53f..49791806e135 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js @@ -17,7 +17,7 @@ add_task(async function () { await waitFor(() => findMessage(hud, loggedString)); ok(true, "The initial message is displayed in the console"); // Create a promise for the message logged after the reload. - const onMessage = waitForMessage(hud, loggedString) + const onMessage = waitForMessage(hud, loggedString); BrowserReload(); await onMessage; ok(true, "The message is also displayed after a page reload"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js index cf899f22d727..2def6bf8da5f 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Make sure that the Web Console output does not break after we try to call // console.dir() for objects that are not inspectable. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js index 2c39ff4132c3..52744da5c6c8 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js @@ -8,8 +8,10 @@ // Check console.group, console.groupCollapsed and console.groupEnd calls // behave as expected. -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html"; -const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent"); +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console-group.html"; +const { INDENT_WIDTH } = + require("devtools/client/webconsole/new-console-output/components/MessageIndent"); add_task(async function () { const hud = await openNewTabAndConsole(TEST_URI); @@ -30,8 +32,8 @@ add_task(async function () { node, store, shouldBeOpen: true, - visibleMessageIdsAfterExpand: ["1","2","3","4","6","8","9","12"], - visibleMessageIdsAfterCollapse: ["1","8","9","12"], + visibleMessageIdsAfterExpand: ["1", "2", "3", "4", "6", "8", "9", "12"], + visibleMessageIdsAfterCollapse: ["1", "8", "9", "12"], }); info("Test a message in a 1 level deep group"); @@ -47,8 +49,8 @@ add_task(async function () { node, store, shouldBeOpen: true, - visibleMessageIdsAfterExpand: ["1","2","3","4","6","8","9","12"], - visibleMessageIdsAfterCollapse: ["1","2","3","6","8","9","12"], + visibleMessageIdsAfterExpand: ["1", "2", "3", "4", "6", "8", "9", "12"], + visibleMessageIdsAfterCollapse: ["1", "2", "3", "6", "8", "9", "12"], }); info("Test a message in a 2 level deep group"); @@ -74,8 +76,8 @@ add_task(async function () { node, store, shouldBeOpen: false, - visibleMessageIdsAfterExpand: ["1","2","3","4","6","8","9","10","12"], - visibleMessageIdsAfterCollapse: ["1","2","3","4","6","8","9","12"] + visibleMessageIdsAfterExpand: ["1", "2", "3", "4", "6", "8", "9", "10", "12"], + visibleMessageIdsAfterCollapse: ["1", "2", "3", "4", "6", "8", "9", "12"] }); info("Test a message at root level, after closing a collapsed group"); @@ -104,23 +106,23 @@ async function testGroupToggle({ visibleMessageIdsAfterCollapse }) { let toggleArrow = node.querySelector(".theme-twisty"); - const isOpen = node => node.classList.contains("open"); + const isOpen = node2 => node2.classList.contains("open"); const assertVisibleMessageIds = (expanded) => { let visibleMessageIds = store.getState().messages.visibleMessages; expanded ? is(visibleMessageIds.toString(), visibleMessageIdsAfterExpand.toString()) : is(visibleMessageIds.toString(), visibleMessageIdsAfterCollapse.toString()); - } + }; - await waitFor(() => isOpen(node) === shouldBeOpen) + await waitFor(() => isOpen(node) === shouldBeOpen); assertVisibleMessageIds(shouldBeOpen); toggleArrow.click(); shouldBeOpen = !shouldBeOpen; - await waitFor(() => isOpen(node) === shouldBeOpen) + await waitFor(() => isOpen(node) === shouldBeOpen); assertVisibleMessageIds(shouldBeOpen); toggleArrow.click(); shouldBeOpen = !shouldBeOpen; - await waitFor(() => isOpen(node) === shouldBeOpen) + await waitFor(() => isOpen(node) === shouldBeOpen); assertVisibleMessageIds(shouldBeOpen); -} \ No newline at end of file +} diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js index cca59e82ad4b..133572eb8b82 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the basic console.log()-style APIs and filtering work for // sharedWorkers diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js index 300b231607cd..cd72ae774425 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js @@ -8,7 +8,8 @@ // Check console.table calls with all the test cases shown // in the MDN doc (https://developer.mozilla.org/en-US/docs/Web/API/Console/table) -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console-table.html"; add_task(function* () { let toolbox = yield openNewTabAndToolbox(TEST_URI, "webconsole"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js index 7554dc987396..0ebb0b66b5a3 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js @@ -25,27 +25,27 @@ add_task(async function testTraceMessages() { variable: "console.trace()", repeats: 3, filename: "test-console-trace-duplicates.html", - line: 23, + line: 24, column: 3, stack: [{ functionName: "foo3", filename: TEST_URI, - line: 23, + line: 24, column: 3 }, { functionName: "foo2", filename: TEST_URI, - line: 19, + line: 20, column: 3 }, { functionName: "foo1", filename: TEST_URI, - line: 11, + line: 12, column: 3 }, { functionName: "", filename: TEST_URI, - line: 26, + line: 27, column: 1 }] }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js index 8fdf98ad06d9..82197a45450a 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js @@ -28,7 +28,7 @@ const TEST_URI = `data:text/html;charset=utf-8,`; const copyObjectMenuItemId = "#console-menu-copy-object"; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); let [msgWithText, msgWithObj, msgNested] = diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js index b79bd92c9d75..a07a39d4f85d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the "Open in sidebar" context menu entry is active for // the correct objects and opens the sidebar when clicked. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js index d205d3ca046d..fb6d0bbf67f4 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js @@ -3,15 +3,17 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the Open URL in new Tab menu item is displayed for network logs and works as // expected. "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-console.html"; + "new-console-output/test/mochitest/test-console.html"; -add_task(async function() { +add_task(async function () { // Enable net messages in the console for this test. await pushPref("devtools.webconsole.filter.net", true); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js index 3223b8bd9fc0..81ff6669b396 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test the "Store as global variable" menu item of the webconsole is enabled only when // clicking on messages that are associated with an object actor. @@ -20,7 +22,7 @@ const TEST_URI = `data:text/html;charset=utf-8,`; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); let messages = await waitFor(() => findMessages(hud, "foo")); @@ -57,7 +59,8 @@ add_task(async function() { content.console.log("foo", obj); }); let msgInvisible = (await onMessageInvisible).node; - await storeAsVariable(hud, msgInvisible, "object", varIdx++, "window.invisibleToDebugger"); + await storeAsVariable(hud, msgInvisible, "object", varIdx++, + "window.invisibleToDebugger"); }); async function storeAsVariable(hud, msg, type, varIdx, equalTo) { diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js index bc2eadb324cc..a2432df4d33e 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that a file with an unsupported CSP directive ('reflected-xss filter') // displays the appropriate message to the console. See Bug 1045902. @@ -10,16 +12,13 @@ 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/new-console-output/test/" + - "mochitest/test_console_csp_ignore_reflected_xss_message.html"; +const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/" + + "test_console_csp_ignore_reflected_xss_message.html"; const TEST_URI = "data:text/html;charset=utf8,Web Console CSP ignoring reflected XSS (bug 1045902)"; -const cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"] - .getService(Ci.nsICacheStorageService); - add_task(async function () { const hud = await openNewTabAndConsole(TEST_URI); await loadDocument(TEST_FILE); @@ -27,5 +26,5 @@ add_task(async function () { await waitFor(() => findMessage(hud, EXPECTED_RESULT, ".message.warn")); ok(true, `CSP logs displayed in console when using "reflected-xss" directive`); - cache.clear(); + Services.cache2.clear(); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js index c7cbfa2dba8d..aac259dda068 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the Web Console CSP messages for two META policies // are correctly displayed. See Bug 1247459. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js index 97210247c506..80cf45062df1 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js @@ -16,9 +16,7 @@ add_task(async function () { info("Closing console"); await closeConsole(); const isFocused = await ContentTask.spawn(gBrowser.selectedBrowser, { }, function () { - const cmp = "@mozilla.org/focus-manager;1"; - const fm = Cc[cmp].getService(Ci.nsIFocusManager); - return fm.focusedWindow == content; + return Services.focus.focusedWindow == content; }); ok(isFocused, "content document has focus after closing the console"); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js index f7be8ea6710b..4e694f8b0f1d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js @@ -1,14 +1,15 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that exceptions thrown by content don't show up twice in the Web // Console. See Bug 582201. "use strict"; -const INIT_URI = "data:text/html;charset=utf8,hello world"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-duplicate-error.html"; + "new-console-output/test/mochitest/test-duplicate-error.html"; add_task(async function () { // On e10s, the exception is triggered in child process @@ -23,5 +24,5 @@ add_task(async function () { const errorMessages = hud.outputNode.querySelectorAll(".message.error"); is(errorMessages.length, 1, "There's only one error message for fooDuplicateError1"); is(errorMessages[0].querySelector(".message-repeats"), null, - "There is no repeat bubble on the error message") + "There is no repeat bubble on the error message"); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js index 3fcf95735b3a..891636df4291 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that errors still show up in the Web Console after a page reload. // See bug 580030: the error handler fails silently after page reload. // https://bugzilla.mozilla.org/show_bug.cgi?id=580030 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js index 3a0cddde9f5c..d5f37b155108 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that makes sure web console eval happens in the user-selected stackframe // from the js debugger. @@ -76,7 +78,7 @@ add_task(async function () { await onResultMessage; ok(true, "`foo + foo3` updated in `firstCall()`"); - await ContentTask.spawn(gBrowser.selectedBrowser, null, function() { + await ContentTask.spawn(gBrowser.selectedBrowser, null, function () { is(content.wrappedJSObject.foo, "globalFooBug783499", "`foo` in content window"); is(content.wrappedJSObject.foo2, "newFoo", "`foo2` in content window"); ok(!content.wrappedJSObject.foo3, "`foo3` was not added to the content window"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js index 236cc77aaeb8..8fca4e9210dd 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test to make sure that web console commands can fire while paused at a // breakpoint that was triggered from a JS call. Relies on asynchronous js // evaluation over the protocol - see Bug 1088861. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js index 685bdfc053d1..98357865369f 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that commands run by the user are executed in content space. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js index b31db15627d6..e80728d4c96c 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js @@ -8,7 +8,8 @@ // See Bug 597136. const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-external-script-errors.html"; + "new-console-output/test/mochitest/" + + "test-external-script-errors.html"; add_task(async function () { // On e10s, the exception is triggered in child process diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js index d8327cc4ea61..93d0de3d5e68 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js @@ -61,7 +61,6 @@ add_task(async function () { await onMessagesUnFiltered; is(outputContainer.scrollTop, 0, "The console is still scrolled to the top after clearing the filter"); - }); function hasVerticalOverflow(container) { diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js index 5b161c9a784c..c8150c84977a 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js @@ -9,7 +9,8 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console-filters.html"; add_task(async function () { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js index d888fc4301fa..5a56f46adfb2 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js @@ -3,13 +3,16 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests all filters persist. "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console-filters.html"; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); let filterButtons = await getFilterButtons(hud); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js index b5c1a5c09ebb..355a526e0f03 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js @@ -1,6 +1,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the $0 console helper works as intended. See Bug 653531. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js index a4bf5e7262c0..d51836a6990e 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js @@ -1,6 +1,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that errors about invalid HPKP security headers are logged to the web console. "use strict"; @@ -8,8 +10,8 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console HPKP invalid header test"; const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" + "new-console-output/test/mochitest/test_hpkp-invalid-headers.sjs"; -const LEARN_MORE_URI = - "https://developer.mozilla.org/docs/Web/HTTP/Public_Key_Pinning" + DOCS_GA_PARAMS; +const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/" + + "Public_Key_Pinning" + DOCS_GA_PARAMS; const NON_BUILTIN_ROOT_PREF = "security.cert_pinning.process_headers_from_non_builtin_roots"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js index 53b61154bea2..961cf5b27b9d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js @@ -1,6 +1,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that errors about invalid HSTS security headers are logged to the web console. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js index db40e283ac06..8c5ad989da16 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that warnings about ineffective iframe sandboxing are logged to the // web console when necessary (and not otherwise). See Bug 752559. @@ -47,5 +49,5 @@ async function testWarningMessageVisibility(uri, visible) { const warning = findMessage(hud, INEFFECTIVE_IFRAME_SANDBOXING_MSG, ".message.warn"); is(!!warning, visible, - `The warning message is${visible ? "": " not"} visible on ${uri}`); + `The warning message is${visible ? "" : " not"} visible on ${uri}`); } diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js index 3065a40d75dd..10bc004a7689 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js @@ -5,7 +5,8 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console.html"; add_task(function* () { let toolbox = yield openNewTabAndToolbox(TEST_URI, "webconsole"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js index 2d7fda7f5ff5..293e1fba2bd5 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the JS input field is focused when the user switches back to the // web console from other tools, see bug 891581. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js index b345b188db90..777342497869 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the input field is focused when the console is opened. "use strict"; @@ -13,7 +15,7 @@ const TEST_URI = console.log("console message 1"); `; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); let inputNode = hud.jsterm.inputNode; @@ -24,7 +26,7 @@ add_task(async function() { ok(hasFocus(inputNode), "input node is focused after output is cleared"); info("Focus during message logging"); - ContentTask.spawn(gBrowser.selectedBrowser, {}, function() { + ContentTask.spawn(gBrowser.selectedBrowser, {}, function () { content.wrappedJSObject.console.log("console message 2"); }); let msg = await waitFor(() => findMessage(hud, "console message 2")); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js index e903ec4bef42..429cf458c80c 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js @@ -3,14 +3,16 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that errors about insecure passwords are logged to the web console. // See Bug 762593. "use strict"; -const TEST_URI = - "http://example.com/browser/devtools/client/webconsole/new-console-output/test/" + - "mochitest/test-insecure-passwords-about-blank-web-console-warning.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/" + + "test-insecure-passwords-about-blank-web-console-warning.html"; const INSECURE_PASSWORD_MSG = "Password fields present on an insecure (http://) iframe." + " This is a security risk that allows user login credentials to be stolen."; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js index a1531b75204e..9a98cd7bb075 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that users can inspect objects logged from cross-domain iframes - // bug 869003. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js index dc9829662774..dd3d9cb12eff 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that basic keyboard shortcuts work in the web console. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js index b441d31b3f0e..3a6f1e5bb14a 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that message source links for js errors and console API calls open in // the jsdebugger when clicked. @@ -10,9 +12,9 @@ requestLongerTimeout(2); const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-location-debugger-link.html"; + "new-console-output/test/mochitest/test-location-debugger-link.html"; -add_task(async function() { +add_task(async function () { // Force the new debugger UI, in case this gets uplifted with the old // debugger still turned on await pushPref("devtools.debugger.new-debugger-frontend", true); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js index 7d401f7cbf4e..f671973b4e82 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js @@ -5,7 +5,9 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/" + + "test-location-styleeditor-link.html"; add_task(async function () { await pushPref("devtools.webconsole.filter.css", true); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js index bbf99c7757f9..8e7d0deac61c 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that long strings can be expanded in the console output. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js index 55129fef11ec..4e98dc58ed7d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the Web Console doesn't leak when multiple tabs and windows are // opened and then closed. See Bug 595350. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js index ddd8818617ec..963be118f00d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js @@ -4,7 +4,8 @@ "use strict"; const TEST_FILE = "test-network-request.html"; -const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/"; +const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/"; const TEST_URI = TEST_PATH + TEST_FILE; add_task(async function task() { diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js index 6fa1e3933e0d..070b4c303098 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that we report JS exceptions in event handlers coming from // network requests, like onreadystate for XHR. See bug 618078. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js index 6bd436300e4b..2db0ae6c4e67 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js @@ -4,7 +4,8 @@ "use strict"; const TEST_FILE = "test-network-request.html"; -const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/"; +const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/"; const TEST_URI = TEST_PATH + TEST_FILE; const NET_PREF = "devtools.webconsole.filter.net"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js index 1a8d028a417f..8af8860df648 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js @@ -8,7 +8,8 @@ const TEST_URI = "data:text/html;charset=utf8,Test that 'Open in Network Panel' const TEST_FILE = "test-network-request.html"; const JSON_TEST_URL = "test-network-request.html"; -const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/"; +const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/"; const NET_PREF = "devtools.webconsole.filter.net"; const XHR_PREF = "devtools.webconsole.filter.netxhr"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js index 63f700d48ea8..1a0baac23984 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js @@ -4,7 +4,8 @@ "use strict"; const TEST_FILE = "test-network-request.html"; -const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/"; +const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/"; const TEST_URI = TEST_PATH + TEST_FILE; const NET_PREF = "devtools.webconsole.filter.net"; @@ -34,7 +35,6 @@ add_task(async function task() { let xhrUrl = TEST_PATH + "test-data.json"; let messageNode = await waitFor(() => findMessage(hud, xhrUrl)); - let urlNode = messageNode.querySelector(".url"); let statusCodeNode = messageNode.querySelector(".status-code"); info("Network message found."); @@ -56,8 +56,10 @@ add_task(async function task() { for (let testCase of testCases) { const { clickEvent } = testCase; - let onConsoleMenuOpened = [rightClickMouseEvent, rightClickCtrlOrCmdKeyMouseEvent].includes(clickEvent) ? - hud.ui.newConsoleOutput.once("menu-open") : null; + let onConsoleMenuOpened = [ + rightClickMouseEvent, + rightClickCtrlOrCmdKeyMouseEvent + ].includes(clickEvent) ? hud.ui.newConsoleOutput.once("menu-open") : null; let { link, where } = await simulateLinkClick(statusCodeNode, testCase.clickEvent); is(link, testCase.link, `Clicking the provided link opens ${link}`); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js index 9fe3c824e681..53c64a494c8f 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that network requests from chrome don't cause the Web Console to // throw exceptions. See Bug 597136. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js index 566a26529139..a15e15333952 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that network log messages bring up the network panel and select the // right request even if it was previously filtered off. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js index 49493cd0bf58..7ba3b2179634 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js @@ -21,7 +21,7 @@ const HTML = ` `; const TEST_URI = "data:text/html;charset=utf-8," + encodeURI(HTML); -add_task(async function() { +add_task(async function () { const hud = await openNewTabAndConsole(TEST_URI); const toolbox = gDevTools.getToolbox(hud.target); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js index 519046545a7d..58b75e6fba83 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that the ObjectInspector is rendered correctly in the sidebar. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js index 360a8a4f0f83..7f437a5ffab5 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that makes sure web console eval works while the js debugger paused the // page, and while the inspector is active. See bug 886137. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js index 710ac9276b1f..a77514eb4740 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js @@ -3,13 +3,16 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that inspecting an optimized out variable works when execution is // paused. "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-closure-optimized-out.html"; + "new-console-output/test/mochitest/" + + "test-closure-optimized-out.html"; add_task(async function () { // Force the old debugger UI since it's directly used (see Bug 1301705) diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js index ae507f05fc4d..c48b29a5f180 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js @@ -10,7 +10,7 @@ // Test that multiple messages are copied into the clipboard and that they are // separated by new lines. See bug 916997. const TEST_URI = "data:text/html," + - "Test copy multiple messages to clipboard"; + "Test copy multiple messages to clipboard"; add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js index a65ddd30856f..d9c8c777d910 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that any output created from calls to the console API comes before the // echoed JavaScript. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js index dfbe72e0d740..071a79fc2544 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js @@ -3,11 +3,14 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that message persistence works - bug 705921 / bug 1307881 "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console.html"; registerCleanupFunction(() => { Services.prefs.clearUserPref("devtools.webconsole.persistlog"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js index 1155b0355f46..d79d4654e234 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js @@ -5,15 +5,15 @@ "use strict"; -// See Bug 597756. Check that errors are still displayed in the console after reloading a -// page. +// See Bug 597756. Check that errors are still displayed in the console after +// reloading a page. const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + "new-console-output/test/mochitest/test-reopen-closed-tab.html"; add_task(async function () { - // If we persist log, the test might be successful even if only the first error log is - // shown + // If we persist log, the test might be successful even if only the first + // error log is shown. pushPref("devtools.webconsole.persistlog", false); info("Open console and refresh tab."); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js index 609ea5730874..8d278532e725 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that makes sure messages are not considered repeated when console.log() // is invoked with different objects, see bug 865288. @@ -23,7 +25,7 @@ add_task(async function () { }); ContentTask.spawn(gBrowser.selectedBrowser, null, () => { - for (var i = 0; i < 3; i++) { + for (let i = 0; i < 3; i++) { const o = { id: "abba" }; content.console.log("abba", o); } diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js index cc88d9b3eaf9..cfb885634c52 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests if the JSTerm sandbox is updated when the user navigates from one // domain to another, in order to avoid permission denied errors with a sandbox // created for a different origin. See Bug 664688. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js index 9c9de015ffdc..8af3ca79d523 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Ensure non-toplevel security errors are displayed "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js index 8bb5545f5172..63ddfc699ff8 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js @@ -27,7 +27,7 @@ const PAGE_URL = `data:text/html, `; -add_task(async function() { +add_task(async function () { await pushPref("devtools.source-map.client-service.enabled", true); await pushPref("devtools.webconsole.filter.css", true); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js index ac3ce7e58a02..1775a3d1f2d0 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js @@ -7,7 +7,8 @@ // Test that a missing source map is reported. -const BASE = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/"; +const BASE = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/"; add_task(async function () { for (let test of ["test-sourcemap-error-01.html", "test-sourcemap-error-02.html"]) { diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js index 04fda3d0f862..a6d923115113 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js @@ -24,7 +24,7 @@ const PAGE_URL = `data:text/html, `; -add_task(async function() { +add_task(async function () { await pushPref("devtools.source-map.client-service.enabled", true); const hud = await openNewTabAndConsole(PAGE_URL); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js index 8b8e74037f17..ca2c162a23d6 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js @@ -24,7 +24,7 @@ const PAGE_URL = `data:text/html, `; -add_task(async function() { +add_task(async function () { // Force the new debugger UI, in case this gets uplifted with the old // debugger still turned on await pushPref("devtools.debugger.new-debugger-frontend", true); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js index 4bf2251eb15b..f4a727b47f4b 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js @@ -3,15 +3,18 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test that message source links for js errors and console API calls open in // the jsdebugger when clicked. "use strict"; const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-stacktrace-location-debugger-link.html"; + "new-console-output/test/mochitest/" + + "test-stacktrace-location-debugger-link.html"; -add_task(async function() { +add_task(async function () { // Force the new debugger UI, in case this gets uplifted with the old // debugger still turned on Services.prefs.setBoolPref("devtools.debugger.new-debugger-frontend", true); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js index 1412d965ef70..4a6cc7e5f982 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Check that "use strict" JS errors generate errors, not warnings. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js index bde67c6f5e2f..8dd30effe873 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js @@ -5,9 +5,10 @@ "use strict"; -const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html"; +const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + + "new-console-output/test/mochitest/test-console.html"; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); info("console.log with a string argument"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js index 944e3a2cfd62..3f425a401bae 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that the Console API implements the time() and timeEnd() methods. "use strict"; diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js index fb5af45198d8..e891e4edbf0a 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Test for the message timestamps option: check if the preference toggles the // display of messages in the console output. See bug 722267. @@ -19,7 +21,7 @@ const TEST_URI = `data:text/html;charset=utf-8, `; const PREF_MESSAGE_TIMESTAMP = "devtools.webconsole.timestampMessages"; -add_task(async function() { +add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); info("Call the log function defined in the test page"); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js index bb3de59e5b4b..4d21ce22751e 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Load a page with tracking elements that get blocked and make sure that a // 'learn more' link shows up in the webconsole. diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js index 7ad514db6456..84f7e3eb9534 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js @@ -3,6 +3,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* import-globals-from head.js */ + // Tests that source URLs in the Web Console can be clicked to display the // standard View Source window. As JS exceptions and console.log() messages always // have their locations opened in Debugger, we need to test a security message in @@ -11,7 +13,8 @@ "use strict"; const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + - "new-console-output/test/mochitest/test-mixedcontent-securityerrors.html"; + "new-console-output/test/mochitest/" + + "test-mixedcontent-securityerrors.html"; add_task(async function () { let hud = await openNewTabAndConsole(TEST_URI); @@ -25,6 +28,6 @@ add_task(async function () { let onTabOpen = BrowserTestUtils.waitForNewTab(gBrowser, null, true); locationNode.click(); - let tab = await onTabOpen; + await onTabOpen; ok(true, "the view source tab was opened in response to clicking the location node"); }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js index c94767b088f5..918d319ee278 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js @@ -45,7 +45,7 @@ add_task(async function () { store.subscribe(() => { const messages = store.getState().messages.messagesById.size; // Also consider the "in-console log" message - if (messages == MESSAGES_COUNT+1) { + if (messages == MESSAGES_COUNT + 1) { done(); } }); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html index 355c00a7c42c..433001d4baf8 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html @@ -8,6 +8,7 @@ --> Test for bug 842682 - use the debugger API for web console autocomplete + foobar585956a("omg"); +

Web Console test for bug 585956 - console.trace().

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html index a592139077d5..277340ad93e9 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html @@ -4,9 +4,10 @@ Web Console test for bug 601177: log levels - + diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js b/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js index 1c07f115592e..96ab6c4d7b5d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js @@ -3,5 +3,7 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +"use strict"; + console.log("Sample log."); console.log("This log should be filtered when filtered for test2.js."); diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html index 34c81b8ead17..7a060904f6db 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html @@ -8,6 +8,9 @@

Test for the cd() command (bug 609872) - iframe child

- + diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html index 91ab5c8f3bb2..ea95e61a971c 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html @@ -8,7 +8,10 @@

Test for the cd() command (bug 609872) - iframe parent

- + diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html index b0419a6fc379..234434e28a77 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html @@ -10,6 +10,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html index 4fadade20791..68aaa0c1588b 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html @@ -6,6 +6,8 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html index ad90f0ebfe1b..8b6e51dae7cc 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html @@ -11,6 +11,7 @@

hello world!

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html index c7b895455e66..ad83f9ad272d 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html @@ -5,6 +5,7 @@ + diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-error.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-error.html index e52cfdf9599c..bd6423ec4c91 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-error.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-error.html @@ -8,13 +8,14 @@

Heads Up Display - error test

- + diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html index ec1bf3f306f1..3d9c4fd5c48c 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html @@ -8,6 +8,7 @@ --> Test for bug 783499 - use the debugger API in the web console diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html index 241b953def8f..926682488634 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html @@ -3,6 +3,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html index 6844614bc5b2..ce96f67d1f09 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html @@ -3,6 +3,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html index d7bcd45d6566..89e4c14d78f1 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html @@ -18,6 +18,7 @@ +

Make sure users can inspect objects from cross-domain iframes.

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html index 09c98670386c..76f7d5dab6d4 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html @@ -4,6 +4,7 @@ Web Console test for bug 621644 +

Web Console test for bug 595934 - category "malformed-xml" diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html index e558468d7358..c07aac397137 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html @@ -10,6 +10,7 @@

Web Console test for bug 595934 - category "DOM Worker javascript".

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html index e80933b06d0c..93730c5c09f2 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html @@ -4,6 +4,7 @@ Console mutation test diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html index 68e19e677503..b47c15692d2c 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html @@ -11,8 +11,9 @@

Bug 597756: test error logging after tab close and reopen.

- + diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html index c3ab78ee7f1d..c10ee21a9956 100644 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html @@ -9,6 +9,7 @@

Make sure js eval results are formatted as strings.