1 files changed, 59 insertions, 0 deletions
diff --git a/browser/components/urlbar/tests/browser/browser_percent_encoded.js b/browser/components/urlbar/tests/browser/browser_percent_encoded.js
new file mode 100644
index 0000000000..c334c03a09
--- /dev/null
+++ b/browser/components/urlbar/tests/browser/browser_percent_encoded.js
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that searching history works for both encoded or decoded strings.
+
+add_task(async function test() {
+  const decoded = "日本";
+  const TEST_URL = TEST_BASE_URL + "?" + decoded;
+  registerCleanupFunction(async () => {
+    await PlacesUtils.history.clear();
+  });
+
+  // Visit url in a new tab, going through normal urlbar workflow.
+  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
+  let promise = PlacesTestUtils.waitForNotification("page-visited", visits => {
+    Assert.equal(
+      visits.length,
+      1,
+      "Was notified for the right number of visits."
+    );
+    let { url, transitionType } = visits[0];
+    return (
+      url == encodeURI(TEST_URL) &&
+      transitionType == PlacesUtils.history.TRANSITIONS.TYPED
+    );
+  });
+  gURLBar.focus();
+  gURLBar.value = TEST_URL;
+  info("Visiting url");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await promise;
+  gBrowser.removeCurrentTab({ skipPermitUnload: true });
+
+  info("Search for the decoded string.");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: decoded,
+  });
+  Assert.equal(
+    UrlbarTestUtils.getResultCount(window),
+    2,
+    "Check number of results"
+  );
+  let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 1);
+  Assert.equal(result.url, encodeURI(TEST_URL), "Check result url");
+
+  info("Search for the encoded string.");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: encodeURIComponent(decoded),
+  });
+  Assert.equal(
+    UrlbarTestUtils.getResultCount(window),
+    2,
+    "Check number of results"
+  );
+  result = await UrlbarTestUtils.getDetailsOfResultAt(window, 1);
+  Assert.equal(result.url, encodeURI(TEST_URL), "Check result url");
+});