1 files changed, 174 insertions, 0 deletions
diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_history_arrow_keys.js b/devtools/client/webconsole/test/browser/browser_jsterm_history_arrow_keys.js
new file mode 100644
index 0000000000..766ed36514
--- /dev/null
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_history_arrow_keys.js
@@ -0,0 +1,174 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// See Bugs 594497 and 619598.
+
+const TEST_URI =
+  "data:text/html;charset=utf-8,<!DOCTYPE html>Web Console test for " +
+  "bug 594497 and bug 619598";
+
+const TEST_VALUES = [
+  "document",
+  "window",
+  "document.body",
+  "document;\nwindow;\ndocument.body",
+  "document.location",
+];
+
+add_task(async function () {
+  const hud = await openNewTabAndConsole(TEST_URI);
+  const { jsterm } = hud;
+
+  const checkInput = (expected, assertionInfo) =>
+    checkInputValueAndCursorPosition(hud, expected, assertionInfo);
+
+  jsterm.focus();
+  checkInput("|", "input is empty");
+
+  info("Execute each test value in the console");
+  for (const value of TEST_VALUES) {
+    await executeAndWaitForResultMessage(hud, value, "");
+  }
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  checkInput("document.location|", "↑: input #4 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  checkInput("document;\nwindow;\ndocument.body|", "↑: input #3 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  info(
+    "Move cursor and ensure hitting arrow up twice won't navigate the history"
+  );
+  EventUtils.synthesizeKey("KEY_ArrowLeft");
+  EventUtils.synthesizeKey("KEY_ArrowLeft");
+  checkInput("document;\nwindow;\ndocument.bo|dy");
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+
+  checkInput("document;|\nwindow;\ndocument.body", "↑↑: input #3 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  checkInput(
+    "|document;\nwindow;\ndocument.body",
+    "↑ again: input #3 is correct"
+  );
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  checkInput("document.body|", "↑: input #2 is correct");
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  checkInput("window|", "↑: input #1 is correct");
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  checkInput("document|", "↑: input #0 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput("window|", "↓: input #1 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput("document.body|", "↓: input #2 is correct");
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput("document;\nwindow;\ndocument.body|", "↓: input #3 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  setCursorAtPosition(hud, 2);
+  checkInput("do|cument;\nwindow;\ndocument.body");
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput("document;\nwindow;\ndo|cument.body", "↓↓: input #3 is correct");
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput(
+    "document;\nwindow;\ndocument.body|",
+    "↓ again: input #3 is correct"
+  );
+  ok(inputHasNoSelection(jsterm));
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput("document.location|", "↓: input #4 is correct");
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  checkInput("|", "↓: input is empty");
+
+  info("Test that Cmd + ArrowDown/Up works as expected on OSX");
+  if (Services.appinfo.OS === "Darwin") {
+    const option = { metaKey: true };
+    EventUtils.synthesizeKey("KEY_ArrowUp", option);
+    checkInput("document.location|", "Cmd+↑ : input is correct");
+
+    EventUtils.synthesizeKey("KEY_ArrowUp", option);
+    checkInput(
+      "document;\nwindow;\ndocument.body|",
+      "Cmd+↑ : input is correct"
+    );
+
+    EventUtils.synthesizeKey("KEY_ArrowUp", option);
+    checkInput(
+      "|document;\nwindow;\ndocument.body",
+      "Cmd+↑ : cursor is moved to the beginning of the input"
+    );
+
+    EventUtils.synthesizeKey("KEY_ArrowUp", option);
+    checkInput("document.body|", "Cmd+↑: input is correct");
+
+    EventUtils.synthesizeKey("KEY_ArrowDown", option);
+    checkInput(
+      "document;\nwindow;\ndocument.body|",
+      "Cmd+↓ : input is correct"
+    );
+
+    EventUtils.synthesizeKey("KEY_ArrowUp", option);
+    checkInput(
+      "|document;\nwindow;\ndocument.body",
+      "Cmd+↑ : cursor is moved to the beginning of the input"
+    );
+
+    EventUtils.synthesizeKey("KEY_ArrowDown", option);
+    checkInput(
+      "document;\nwindow;\ndocument.body|",
+      "Cmd+↓ : cursor is moved to the end of the input"
+    );
+
+    EventUtils.synthesizeKey("KEY_ArrowDown", option);
+    checkInput("document.location|", "Cmd+↓ : input is correct");
+
+    EventUtils.synthesizeKey("KEY_ArrowDown", option);
+    checkInput("|", "Cmd+↓: input is empty");
+  }
+});
+
+function setCursorAtPosition(hud, pos) {
+  const { editor } = hud.jsterm;
+
+  let line = 0;
+  let ch = 0;
+  let currentPos = 0;
+  getInputValue(hud)
+    .split("\n")
+    .every(l => {
+      if (l.length < pos - currentPos) {
+        line++;
+        currentPos += l.length;
+        return true;
+      }
+      ch = pos - currentPos;
+      return false;
+    });
+  return editor.setCursor({ line, ch });
+}
+
+function inputHasNoSelection(jsterm) {
+  return !jsterm.editor.getDoc().getSelection();
+}