Bug 1647893 - Enter search mode with default engine on Accel+K. r=adw

Differential Revision: https://phabricator.services.mozilla.com/D85914
dothq · Aug 5, 2020 · 649526b · 649526b
1 parent fad9416
commit 649526b
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 10 deletions.
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -4241,7 +4241,7 @@ const BrowserSearch = {
     let focusUrlBarIfSearchFieldIsNotActive = function(aSearchBar) {
       if (!aSearchBar || document.activeElement != aSearchBar.textbox) {
         // Limit the results to search suggestions, like the search bar.
-        gURLBar.search(UrlbarTokenizer.RESTRICT.SEARCH);
+        gURLBar.searchModeShortcut();
       }
     };
 

diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
@@ -1216,6 +1216,21 @@ class UrlbarInput {
     }
   }
 
+  /**
+   * Enters search mode with the default engine.
+   * If update2 is not enabled, it searches with the SEARCH restriction token
+   * instead.
+   */
+  searchModeShortcut() {
+    if (this.view.oneOffsRefresh) {
+      let defaultEngine = Services.search.defaultEngine;
+      this.setSearchMode(defaultEngine);
+      this.search("");
+    } else {
+      this.search(UrlbarTokenizer.RESTRICT.SEARCH);
+    }
+  }
+
   // Getters and Setters below.
 
   get editor() {

diff --git a/browser/components/urlbar/tests/browser/browser_searchModeIndicator.js b/browser/components/urlbar/tests/browser/browser_searchModeIndicator.js
@@ -80,6 +80,20 @@ async function exitSearchMode(
   window,
   { backspace, clickClose, waitForSearch = true }
 ) {
+  // If the Urlbar is not extended, ignore the clickClose parameter. The close
+  // button is not clickable in this state. This state might be encountered on
+  // Linux, where prefers-reduced-motion is enabled in automation.
+  if (!gURLBar.hasAttribute("breakout-extend") && clickClose) {
+    if (waitForSearch) {
+      let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+      gURLBar.setSearchMode(null);
+      await searchPromise;
+    } else {
+      gURLBar.setSearchMode(null);
+    }
+    return;
+  }
+
   if (backspace) {
     let urlbarValue = gURLBar.value;
     gURLBar.selectionStart = gURLBar.selectionEnd = 0;
@@ -251,15 +265,31 @@ add_task(async function click_close() {
   });
   await enterSearchMode(window);
   UrlbarTestUtils.promisePopupClose(window);
-  if (gURLBar.hasAttribute("breakout-extend")) {
-    await exitSearchMode(window, { clickClose: true, waitForSearch: false });
-  } else {
-    // If the Urlbar is not extended when it is closed, do not finish this
-    // case. The close button is not clickable when the Urlbar is not
-    // extended. This scenario might be encountered on Linux, where
-    // prefers-reduced-motion is enabled in automation.
-    gURLBar.setSearchMode(null);
-  }
+  await exitSearchMode(window, { clickClose: true, waitForSearch: false });
+});
+
+// Tests that Accel+K enters search mode with the default engine.
+add_task(async function keyboard_shortcut() {
+  UrlbarTestUtils.assertSearchMode(window, null);
+  EventUtils.synthesizeKey("k", { accelKey: true });
+  UrlbarTestUtils.assertSearchMode(window, {
+    source: UrlbarUtils.RESULT_SOURCE.SEARCH,
+    engineName: defaultEngine.name,
+  });
+  await exitSearchMode(window, { clickClose: true, waitForSearch: false });
+});
+
+// Tests that the Tools:Search menu item enters search mode with the default
+// engine.
+add_task(async function menubar_item() {
+  UrlbarTestUtils.assertSearchMode(window, null);
+  let command = window.document.getElementById("Tools:Search");
+  command.doCommand();
+  UrlbarTestUtils.assertSearchMode(window, {
+    source: UrlbarUtils.RESULT_SOURCE.SEARCH,
+    engineName: defaultEngine.name,
+  });
+  await exitSearchMode(window, { clickClose: true, waitForSearch: false });
 });
 
 // Tests that entering search mode invalidates pageproxystate and exits search