tor-browser

commit 80e1cac3a08e6cad9fec33a8588e2eca22e85ab4
parent 98714f708a64f168c2807dc110f369932f63450f
Author: iulian moraru <imoraru@mozilla.com>
Date:   Fri,  5 Dec 2025 22:18:35 +0200

Revert "Bug 2002479 - Update chatbot shortcut test due to a11y regression bug. r=yjamora,ai-frontend-reviewers,fluent-reviewers,flod" for causing bc failures on browser_clipboard_paste_chat_shortcuts.js.

This reverts commit 3e897c3b0cfada1e877fac66da47f63774c969e7.

Diffstat:
M
browser/components/genai/GenAI.sys.mjs
 | 
17
+----------------
M
browser/components/genai/tests/browser/browser_chat_shortcuts.js
 | 
7
+++----
M
browser/locales/en-US/browser/genai.ftl
 | 
3
---

3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/browser/components/genai/GenAI.sys.mjs b/browser/components/genai/GenAI.sys.mjs
@@ -395,18 +395,7 @@ export const GenAI = {
     }
     aiActionButton.initialized = true;
 
-    const setAIButtonAriaLabel = chatProvider => {
-      document.l10n.setAttributes(aiActionButton, "genai-shortcut-button", {
-        provider: chatProvider.name,
-      });
-    };
-
     const document = aiActionButton.ownerDocument;
-    const initialChatProvider = this.chatProviders.get(lazy.chatProvider);
-    setAIButtonAriaLabel(initialChatProvider);
-    const initialChatProviderName = {
-      name: initialChatProvider.name,
-    };
     const buttonActiveState = "icon";
     const buttonDefaultState = "icon ghost";
     const chatShortcutsOptionsPanel = document.getElementById(
@@ -471,12 +460,8 @@ export const GenAI = {
       const vbox = chatShortcutsOptionsPanel.querySelector("vbox");
       vbox.innerHTML = "";
 
-      const showWarning = this.isContextTooLong(aiActionButton.data.selection);
       const chatProvider = this.chatProviders.get(lazy.chatProvider);
-
-      if (initialChatProviderName !== chatProvider.name) {
-        setAIButtonAriaLabel(chatProvider);
-      }
+      const showWarning = this.isContextTooLong(aiActionButton.data.selection);
 
       // Show warning if selection is too long
       if (showWarning) {
diff --git a/browser/components/genai/tests/browser/browser_chat_shortcuts.js b/browser/components/genai/tests/browser/browser_chat_shortcuts.js
@@ -137,10 +137,9 @@ add_task(async function test_show_shortcuts() {
     );
 
     let beforeClick = Glean.genaiChatbot.shortcutsExpanded.testGetValue();
-    shortcuts.click();
+    EventUtils.sendMouseEvent({ type: "click" }, shortcuts);
     await BrowserTestUtils.waitForEvent(popup, "popupshown");
     Assert.equal(popup.state, "open", "Popup open with click");
-
     let afterClick = Glean.genaiChatbot.shortcutsExpanded.testGetValue();
     Assert.equal(
       afterClick.length,
@@ -214,7 +213,7 @@ add_task(async function test_show_shortcuts_second_tab() {
       const stub = sandbox.stub(GenAI, "addAskChatItems");
 
       const shortcuts = document.querySelector("#ai-action-button");
-      shortcuts.click();
+      EventUtils.sendMouseEvent({ type: "click" }, shortcuts);
 
       Assert.equal(stub.callCount, 1, "Shortcuts added on select");
       Assert.equal(stub.firstCall.args[0], browser, "Got correct browser");
@@ -272,7 +271,7 @@ add_task(async function test_show_warning_label() {
       );
 
       // Click button
-      aiActionButton.click();
+      EventUtils.sendMouseEvent({ type: "click" }, aiActionButton);
 
       const chatShortcutsOptionsPanel = document.getElementById(
         "chat-shortcuts-options-panel"
diff --git a/browser/locales/en-US/browser/genai.ftl b/browser/locales/en-US/browser/genai.ftl
@@ -70,9 +70,6 @@ genai-menu-remove-provider =
     .label = Remove { $provider }
 genai-menu-remove-sidebar =
     .label = Remove from Sidebar
-# $provider (string) - name of the AI chat provider
-genai-shortcut-button =
-    .aria-label = Ask { $provider }
 
 genai-menu-new-badge = New
 genai-menu-summarize-page = Summarize Page