--- a/devtools/client/webconsole/test/mocha-test-setup.js
+++ b/devtools/client/webconsole/test/mocha-test-setup.js
@@ -19,17 +19,17 @@ pref("devtools.webconsole.filter.debug",
pref("devtools.webconsole.filter.css", false);
pref("devtools.webconsole.filter.net", false);
pref("devtools.webconsole.filter.netxhr", false);
pref("devtools.webconsole.ui.filterbar", false);
pref("devtools.webconsole.inputHistoryCount", 50);
pref("devtools.webconsole.persistlog", false);
pref("devtools.webconsole.timestampMessages", false);
pref("devtools.webconsole.sidebarToggle", true);
-pref("devtools.webconsole.jsterm.codeMirror", false);
+pref("devtools.webconsole.jsterm.codeMirror", true);
global.loader = {
lazyServiceGetter: () => {},
lazyRequireGetter: (context, name, path) => {
if (path === "devtools/shared/async-storage") {
global[name] = require("devtools/client/webconsole/test/fixtures/async-storage");
}
}
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
@@ -8,16 +8,17 @@
// See https://bugzilla.mozilla.org/show_bug.cgi?id=817834
"use strict";
const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 817834";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
@@ -6,16 +6,17 @@
"use strict";
// Test that properties starting with underscores or dollars can be
// autocompleted (bug 967468).
const TEST_URI = "data:text/html;charset=utf8,test autocompletion with $ or _";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
@@ -12,16 +12,17 @@ const TEST_URI = `data:text/html;charset
<script>
window.foo = [1,2,3];
</script>
</head>
<body>bug 585991 - Autocomplete popup on array</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
@@ -12,16 +12,17 @@ const TEST_URI = `data:text/html;charset
window.foo = Object.create(null, Object.getOwnPropertyDescriptors({
aa: "a",
bb: "b",
}));
</script></head><body>Autocomplete text navigation key usage test</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
@@ -7,16 +7,17 @@
// user input is a subset of the existing completion results.
"use strict";
const TEST_URI = "data:text/html;charset=utf8,<p>test cached autocompletion results";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
@@ -4,16 +4,17 @@
"use strict";
// Test that console commands are autocompleted.
const TEST_URI = `data:text/html;charset=utf-8,Test command autocomplete`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
@@ -6,16 +6,17 @@
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
"test/mochitest/test-iframe-parent.html";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
@@ -19,16 +19,17 @@ const TEST_URI = `data:text/html;charset
item1: "value1",
});
</script>
</head>
<body>bug 585991 - autocomplete popup escape key usage test</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
@@ -7,16 +7,17 @@
// appears. See Bug 592442.
"use strict";
const TEST_URI = "data:text/html;charset=utf-8,test for bug 592442";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
@@ -7,16 +7,17 @@
// See Bug 686937.
"use strict";
const TEST_URI = "data:text/html;charset=utf8,<p>test JSTerm Helpers autocomplete";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
@@ -4,16 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that code completion works properly in chrome tabs, like about:config.
"use strict";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole("about:config");
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
@@ -8,16 +8,17 @@
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
"test/mochitest/test-autocomplete-in-stackframe.html";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
// Force the old debugger UI since it's directly used (see Bug 1301705)
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
@@ -13,16 +13,17 @@ const TEST_URI = `data:text/html;charset
window.testBugA = "hello world";
window.testBugB = "hello world 2";
</script>
</head>
<body>bug 812618 - test completion inside text</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
@@ -7,16 +7,17 @@
// See Bug 651501.
"use strict";
const TEST_URI = "data:text/html;charset=utf-8,Test document.body autocompletion";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
@@ -21,16 +21,17 @@ const TEST_URI = `data:text/html;charset
item3: "value3",
});
</script>
</head>
<body>bug 585991 - autocomplete popup navigation and tab key usage test</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
@@ -12,16 +12,17 @@ XPCOMUtils.defineLazyServiceGetter(
"clipboardHelper",
"@mozilla.org/widget/clipboardhelper;1",
"nsIClipboardHelper"
);
const stringToCopy = "foobazbarBug642615";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm, ui} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
@@ -21,16 +21,17 @@ const TEST_URI = `data:text/html;charset
item3: "value3",
});
</script>
</head>
<body>bug 585991 - test pressing return with open popup</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
@@ -17,16 +17,17 @@ const TEST_URI = `data:text/html;charset
<body>bug 873250 - test pressing return with open popup, but no selection</body>`;
const {
getHistoryEntries,
} = require("devtools/client/webconsole/selectors/history");
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
@@ -6,16 +6,17 @@
// Tests that code completion works properly.
"use strict";
const TEST_URI = "data:text/html;charset=utf8,<p>test code completion";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm, ui} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
@@ -33,16 +33,17 @@ const TEST_URI = `data:text/html,<meta c
const helpers = ${JSON.stringify(HELPERS)};
for (const helper of helpers) {
window[helper] = () => "${PREFIX}" + helper;
}
</script>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
@@ -23,16 +23,17 @@ const TEST_URI = `data:text/html;charset
<p>This is some example text</p>
<p id="${id}">${text}</p>
</div>
<div><p></p></div>
</body>`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
@@ -6,16 +6,17 @@
// Map Control + A to Select All, In the web console input
"use strict";
const TEST_URI = "data:text/html;charset=utf-8,Test console select all";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
@@ -11,16 +11,17 @@
// - ctrl-a, ctrl-p and ctrl-n only work on OSX
"use strict";
const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
"bug 804845 and bug 619598";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
@@ -2,16 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_URI = "data:text/html,Test evaluating document";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
@@ -2,16 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_URI = "data:text/html,Test error documentation";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
@@ -5,16 +5,17 @@
// Ensure that dom errors, with error numbers outside of the range
// of valid js.msg errors, don't cause crashes (See Bug 1270721).
const TEST_URI = "data:text/html,Test error documentation";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
@@ -2,16 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_URI = "data:text/html,Test <code>clear()</code> jsterm helper";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
@@ -12,16 +12,17 @@ const TEST_URI = `data:text/html,
<li>Second</li>
</ul>
<aside>Sidebar</aside>
</main>
`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
@@ -12,16 +12,17 @@ const TEST_URI = `data:text/html,
<li>Second</li>
</ul>
<aside>Sidebar</aside>
</main>
`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
@@ -12,16 +12,17 @@ const TEST_URI = `data:text/html,
<li>Second</li>
</ul>
<aside>Sidebar</aside>
</main>
`;
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
@@ -3,16 +3,17 @@
"use strict";
const TEST_URI = "data:text/html,Test <code>help()</code> jsterm helper";
const HELP_URL = "https://developer.mozilla.org/docs/Tools/Web_Console/Helpers";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
@@ -3,16 +3,17 @@
"use strict";
const TEST_URI =
"data:text/html,Test <code>keys()</code> & <code>values()</code> jsterm helper";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
@@ -2,16 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_URI = "data:text/html,Test <code>pprint()</code> jsterm helper";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
@@ -19,16 +19,17 @@
* - webconsole jsterm should be enabled
* - webconsole object inspector properties should be set.
*/
"use strict";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
let browserConsole, webConsole, objInspector;
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
@@ -12,16 +12,17 @@ const COMMANDS = ["document", "window",
const {
HISTORY_BACK,
HISTORY_FORWARD,
} = require("devtools/client/webconsole/constants");
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await testHistory();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await testHistory();
});
async function testHistory() {
const { jsterm, ui } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
@@ -15,16 +15,17 @@ const TEST_VALUES = [
"window",
"document.body",
"document;\nwindow;\ndocument.body",
"document.location",
];
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
@@ -8,16 +8,17 @@
// See Bug 660806. Check that history navigation with the UP/DOWN arrows does not trigger
// autocompletion.
const TEST_URI = "data:text/html;charset=utf-8,<p>bug 660806 - history " +
"navigation must not show the autocomplete popup";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await testHistory();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await testHistory();
});
async function testHistory() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
@@ -14,16 +14,17 @@ const TEST_URI = "data:text/html;charset
const INPUT_HISTORY_COUNT = 10;
const {
getHistoryEntries,
} = require("devtools/client/webconsole/selectors/history");
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await testHistory();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await testHistory();
});
async function testHistory() {
info("Setting custom input history pref to " + INPUT_HISTORY_COUNT);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
@@ -6,16 +6,17 @@
"use strict";
// Check that the jsterm input supports multiline values. See Bug 588967.
const TEST_URI = "data:text/html;charset=utf-8,Test for jsterm multine input";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const {jsterm, ui} = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
@@ -6,16 +6,17 @@
// Check that the inspect() jsterm helper function works.
"use strict";
const TEST_URI = "data:text/html;charset=utf8,<p>test inspect() command";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
@@ -3,16 +3,17 @@
"use strict";
// Check instanceof correctness. See Bug 599940.
const TEST_URI = "data:text/html,Test <code>instanceof</code> evaluation";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
@@ -72,16 +72,17 @@ const DATA = [
extra: {
lines: "3"
}
}
];
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
// Let's reset the counts.
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
@@ -7,16 +7,17 @@
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
"test/mochitest/test-console.html";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
@@ -6,16 +6,17 @@
"use strict";
// See Bug 583816.
const TEST_URI = "data:text/html,Testing jsterm with no input";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
@@ -3,16 +3,17 @@
"use strict";
const TEST_URI =
"data:text/html,Test evaluating null and undefined";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
@@ -8,16 +8,17 @@
"use strict";
const TEST_URI = "data:text/html;charset=utf-8,<p>bug 900448 - autocomplete " +
"popup closes on tab switch";
const TEST_URI_NAVIGATE = "data:text/html;charset=utf-8,<p>testing autocomplete closes";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
@@ -9,16 +9,17 @@ const TEST_URI = "http://example.com/bro
"test/mochitest/test_jsterm_screenshot_command.html";
// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
// to keep tests consistant across OSs we are setting the dpr to 1
const dpr = "--dpr 1";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
const hud = await openNewTabAndConsole(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
@@ -10,16 +10,17 @@ const TEST_URI = "http://example.com/bro
const FileUtils = (ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})).FileUtils;
// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
// to keep tests consistant across OSs we are setting the dpr to 1
const dpr = "--dpr 1";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTests();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTests();
});
async function performTests() {
await addTab(TEST_URI);
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
@@ -13,16 +13,17 @@ XPCOMUtils.defineLazyServiceGetter(
"@mozilla.org/widget/clipboardhelper;1",
"nsIClipboardHelper"
);
const WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
const stringToCopy = "EvilCommand";
add_task(async function() {
// Run test with legacy JsTerm
+ await pushPref("devtools.webconsole.jsterm.codeMirror", false);
await performTest();
// And then run it with the CodeMirror-powered one.
await pushPref("devtools.webconsole.jsterm.codeMirror", true);
await performTest();
});
async function performTest() {
await pushPref("devtools.selfxss.count", 0);