Bug 1408939 - enable browser_webconsole_history_arrow_keys.js;r=Honza
MozReview-Commit-ID: KvBrFRMW0W1
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -287,17 +287,16 @@ skip-if = true # Bug 1404382
[browser_webconsole_filter_scroll.js]
skip-if = true # Bug 1404392
[browser_webconsole_filters.js]
[browser_webconsole_filters_persist.js]
[browser_webconsole_highlighter_console_helper.js]
skip-if = true # Bug 1404853
# old console skip-if = true # Requires direct access to content nodes
[browser_webconsole_history_arrow_keys.js]
-skip-if = true # Bug 1408939
[browser_webconsole_hpkp_invalid-headers.js]
skip-if = true # Bug 1405340
# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
[browser_webconsole_hsts_invalid-headers.js]
skip-if = true # Bug 1405341
# old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
[browser_webconsole_iframe_wrong_hud.js]
skip-if = true # Bug 1404378
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
@@ -2,54 +2,49 @@
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// See Bugs 594497 and 619598.
-var jsterm, inputNode, values;
-
-var TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
+const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
"bug 594497 and bug 619598";
-add_task(function* () {
- yield loadTab(TEST_URI);
-
- let hud = yield openConsole();
+const TEST_VALUES = [
+ "document",
+ "window",
+ "document.body",
+ "document;\nwindow;\ndocument.body",
+ "document.location",
+];
- setup(hud);
- performTests();
+add_task(async function () {
+ let hud = await openNewTabAndConsole(TEST_URI);
+ let { jsterm } = hud;
+
+ jsterm.focus();
+ ok(!jsterm.getInputValue(), "jsterm.getInputValue() is empty");
- jsterm = inputNode = values = null;
+ info("Execute each test value in the console");
+ for (let value of TEST_VALUES) {
+ jsterm.setInputValue(value);
+ jsterm.execute();
+ }
+
+ performTests(jsterm);
});
-function setup(HUD) {
- jsterm = HUD.jsterm;
- inputNode = jsterm.inputNode;
-
- jsterm.focus();
-
- ok(!jsterm.getInputValue(), "jsterm.getInputValue() is empty");
-
- values = ["document", "window", "document.body"];
- values.push(values.join(";\n"), "document.location");
+function performTests(jsterm) {
+ let { inputNode } = jsterm;
+ let values = TEST_VALUES;
- // Execute each of the values;
- for (let i = 0; i < values.length; i++) {
- jsterm.setInputValue(values[i]);
- jsterm.execute();
- }
-}
-
-function performTests() {
EventUtils.synthesizeKey("VK_UP", {});
-
is(jsterm.getInputValue(), values[4],
"VK_UP: jsterm.getInputValue() #4 is correct");
ok(inputNode.selectionStart == values[4].length &&
inputNode.selectionStart == inputNode.selectionEnd,
"caret location is correct");
EventUtils.synthesizeKey("VK_UP", {});
@@ -143,15 +138,15 @@ function performTests() {
ok(inputNode.selectionStart == values[3].length &&
inputNode.selectionStart == inputNode.selectionEnd,
"caret location is correct");
EventUtils.synthesizeKey("VK_DOWN", {});
is(jsterm.getInputValue(), values[4],
- "VK_DOWN: jsterm.getInputValue() #4 is correct");
+ "VK_DOWN: jsterm.getInputValue() #4 is correct");
EventUtils.synthesizeKey("VK_DOWN", {});
ok(!jsterm.getInputValue(),
"VK_DOWN: jsterm.getInputValue() is empty");
}