Merge branch 'main' into ben/new-manifests

Author: ben-c-at-moz

.github/workflows/l10n.yml

@@ -195,6 +195,7 @@ jobs:
           echo $gecko_url
           Invoke-WebRequest -Uri $gecko_url -OutFile "geckodriver.zip"
           unzip geckodriver.zip
+          echo "$env:GITHUB_WORKSPACE" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         shell: pwsh
       - name: Download Beta
         if: ${{ !inputs.win_installer_link }}
@@ -228,7 +229,7 @@ jobs:
               $line = $_
               Write-Host "Running tests for: $line"
               try {
-                  pipenv run python -m l10n_CM.run_l10n --geckodriver=geckodriver.exe --fx-executable="$env:FX_EXECUTABLE" $line
+                  pipenv run python -m l10n_CM.run_l10n --fx-executable="$env:FX_EXECUTABLE" $line
               } catch {
                   $SCRIPT_EXIT_CODE = $_.Exception.HResult
               }

SELECTOR_INFO.md

@@ -2330,6 +2330,13 @@ Description: bsky website sign in button
 Location: Bsky website
 Path to .json: modules/data/generic_page.components.json
 ```
+```
+Selector Name: url-to-copy
+Selector Data: "p[contenteditable]"
+Description: Clipboard page to copy url
+Location: Clipboard test page
+Path to .json: modules/data/generic_page.components.json
+```
 #### generic_pdf
 ```
 Selector Name: highlighted-text
@@ -3273,7 +3280,27 @@ Description: Searchbar search engine button
 Location: Searchbar
 Path to .json: modules/data/navigation.components.json
 ```
-searchbar-search-engine
+```
+Selector Name: search-mode-chicklet
+Selector Data: label.searchmode-switcher-title
+Description: Search mode chicklet
+Location: Address bar search mode
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector Name: history-button-search-mode
+Selector Data: search-button-history
+Description: Histroy button search mode
+Location: Search mode
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector Name: exit-button-searchmode
+Selector Data: toolbarbutton[data-l10n-id='urlbar-searchmode-exit-button']
+Description: Exit button searchmode
+Location: Address bar searchmode
+Path to .json: modules/data/navigation.components.json
+```
 #### panel_ui
 ```
 Selector name: panel-ui-button

l10n_CM/constants/demo/demo_ad.json

@@ -11,6 +11,7 @@
     "email": "email",
     "telephone": "tel"
   },
+
   "fields": [
     "name",
     "organization",

l10n_CM/region/AT.json

@@ -10,6 +10,7 @@
     "libro",
     "mediamarkt"
   ],
+
   "tests": [
   ]
 }

l10n_CM/run_l10n.py

@@ -122,7 +122,7 @@ class MyHttpRequestHandler(SimpleHTTPRequestHandler):
     region = None
 
     def translate_path(self, path):
-        """switch the default directory where the html files are served from."""
+        """switch the default directory where the HTML files are served from."""
         base_dir = os.path.join(current_dir, "sites", self.live_site, self.region)
         return os.path.join(base_dir, path.lstrip("/"))
 

modules/browser_object_navigation.py

@@ -2,6 +2,7 @@
 import re
 import time
 from typing import Literal
+from urllib.parse import urlparse
 
 from selenium.common.exceptions import StaleElementReferenceException, TimeoutException
 from selenium.webdriver import ActionChains, Firefox
@@ -90,15 +91,6 @@ def type_in_awesome_bar(self, term: str) -> BasePage:
         self.awesome_bar.send_keys(term)
         return self
 
-    @BasePage.context_chrome
-    def press_ctrl_enter(self) -> BasePage:
-        """Press Ctrl/Cmd + Enter in Awesome Bar."""
-        if self.sys_platform() == "Darwin":
-            self.perform_key_combo(Keys.COMMAND, Keys.ENTER)
-        else:
-            self.perform_key_combo(Keys.CONTROL, Keys.ENTER)
-        return self
-
     def set_search_mode_via_awesome_bar(self, mode: str) -> BasePage:
         """
         Given a `mode`, set the Awesome Bar search mode. Returns self.
@@ -382,10 +374,11 @@ def wait_for_suggestions_absent(self):
         self.element_not_visible("suggestion-titles")
         return self
 
-    def open_usb_and_select_engine(self, engine_title: str):
-        """Click the USB icon and select a search engine by its title."""
+    @BasePage.context_chrome
+    def open_usb_and_select_option(self, option_title: str):
+        """Click the USB icon and select an option by its title."""
         self.get_element("searchmode-switcher").click()
-        self.get_element("search-mode-switcher-option", labels=[engine_title]).click()
+        self.get_element("search-mode-switcher-option", labels=[option_title]).click()
         return self
 
     def assert_search_mode_chip_visible(self):
@@ -394,6 +387,40 @@ def assert_search_mode_chip_visible(self):
         self.get_element("search-mode-span")
         return self
 
+    @BasePage.context_chrome
+    def verify_search_mode_is_visible(self):
+        """Ensure the search mode is visible in URLbar"""
+        self.element_visible("search-mode-chicklet")
+        return self
+
+    @BasePage.context_chrome
+    def verify_search_mode_is_not_visible(self):
+        """Ensure the search mode is cleared from URLbar"""
+        self.element_not_visible("search-mode-chicklet")
+        return self
+
+    @BasePage.context_chrome
+    def verify_search_mode_label(self, engine_name: str):
+        """Verify that the search mode chicklet displays the correct engine."""
+        chicklet = self.get_element("search-mode-chicklet")
+        chip_text = (
+            chicklet.text or chicklet.get_attribute("aria-label") or ""
+        ).lower()
+        assert engine_name.lower() in chip_text, (
+            f"Expected search mode engine '{engine_name}', got '{chip_text}'"
+        )
+        return self
+
+    @BasePage.context_chrome
+    def verify_plain_text_in_input_awesome_bar(self, expected_text: str):
+        """Verify the awesomebar input contains the exact literal text."""
+        input_el = self.get_element("awesome-bar")
+        value = input_el.get_attribute("value")
+        assert value == expected_text, (
+            f"Expected input '{expected_text}', got '{value}'"
+        )
+        return self
+
     def click_first_suggestion_row(self):
         """
         Clicks the first visible suggestion row in the list, using robust scrolling and fallback.
@@ -907,6 +934,27 @@ def verify_status_panel_url(self, expected_url: str):
             f"Expected '{expected_url}' in status panel URL, got '{actual_url}'"
         )
 
+    @BasePage.context_content
+    def verify_domain(self, expected_domain: str) -> None:
+        """
+        Verify that the current URL's domain matches the expected domain using urlparse.
+        This explicitly checks the domain (netloc) rather than just a substring match.
+        Uses content context to get the actual page URL.
+
+        Argument:
+            expected_domain: The expected domain (e.g., "wikipedia.org", "google.com")
+        """
+
+        def _domain_matches(_):
+            parsed = urlparse(self.driver.current_url)
+            return expected_domain in parsed.netloc
+
+        self.custom_wait(timeout=15).until(_domain_matches)
+        parsed_url = urlparse(self.driver.current_url)
+        assert expected_domain in parsed_url.netloc, (
+            f"Expected '{expected_domain}' domain, got '{parsed_url.netloc}'"
+        )
+
     @BasePage.context_chrome
     def verify_engine_returned(self, engine: str) -> None:
         """
@@ -996,3 +1044,15 @@ def add_search_bar_to_toolbar(self) -> BasePage:
         self.panel_ui.navigate_to_customize_toolbar()
         self.customize.add_widget_to_toolbar("search-bar")
         return self
+
+    @BasePage.context_chrome
+    def click_exit_button_searchmode(self) -> None:
+        """
+        Click the 'Exit' button in the search mode.
+        Waits until the button is visible and clickable before performing the click.
+        """
+        # Wait until the element is visible and clickable
+        self.expect(lambda _: self.get_element("exit-button-searchmode").is_displayed())
+
+        # Click the button
+        self.get_element("exit-button-searchmode").click()

modules/data/generic_page.components.json

@@ -76,5 +76,11 @@
         "selectorData": "//button[@aria-label='Sign in']",
         "strategy": "xpath",
         "groups": []
+    },
+
+    "url-to-copy": {
+        "selectorData": "p[contenteditable]",
+        "strategy": "css",
+        "groups": []
     }
 }

modules/data/navigation.components.json

@@ -645,6 +645,24 @@
         "selectorData": "button.searchbar-engine-one-off-item[tooltiptext='{engine}']",
         "strategy": "css",
         "groups": ["doNotCache"]
+    },
+
+    "search-mode-chicklet": {
+        "selectorData": "label.searchmode-switcher-title",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "history-button-search-mode": {
+        "selectorData": "search-button-history",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "exit-button-searchmode": {
+        "selectorData": "toolbarbutton[data-l10n-id='urlbar-searchmode-exit-button']",
+        "strategy": "css",
+        "groups": []
     }
 
 }

tests/address_bar_and_search/test_addon_suggestion.py

@@ -6,17 +6,16 @@
 
 from modules.browser_object import Navigation
 
-WAIT_TIMEOUT = 10
 ADDONS_BASE_URL = "https://addons.mozilla.org/en-US/firefox/addon/"
 
+# pending answers from search team about FX changes here, only grammar works as before
 INPUT_TO_ADDON_NAME = {
-    "clips": "video-downloadhelper",
+    "video download": "video-downloadhelper",
     "grammar": "languagetool",
-    "Temp mail": "private-relay",
-    "pics search": "search_by_image",
+    "alias": "private-relay",
+    "image finder": "search_by_image",
     "darker theme": "darkreader",
-    "privacy": "privacy-badger17",
-    "read aloud": "read-aloud",
+    "accessibility reade": "read-aloud",
 }
 
 
@@ -28,7 +27,7 @@ def test_case():
 @pytest.mark.noxvfb
 def test_addon_suggestion_based_on_search_input(driver: Firefox):
     """
-    C2234714 - Verify that the address bar suggests relevant add-ons based on search input.
+    C3029292 - Verify that the address bar suggests relevant add-ons based on search input.
     """
     nav = Navigation(driver)
     nav.set_awesome_bar()

tests/address_bar_and_search/test_ctrl_enter_completes_link_and_can_refresh.py

@@ -0,0 +1,50 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.common.keys import Keys
+
+from modules.browser_object import Navigation
+
+
+@pytest.fixture()
+def test_case():
+    return "3028887"
+
+
+TAB_1_INPUT = "example"
+TAB_1_EXPECTED_DOMAIN = "example.com"
+
+TAB_2_INPUT = "facebook"
+TAB_2_EXPECTED_DOMAIN = "facebook.com"
+
+
+def test_ctrl_enter_refreshes_tab(driver: Firefox):
+    """
+    C3028887 - Verify that Ctrl/Cmd + R refreshes the webpage in the first tab
+    after navigating with Ctrl/Cmd + Enter.
+    """
+    # Instantiate objects
+    nav = Navigation(driver)
+
+    # Open first tab and navigate using Ctrl+Enter
+    nav.type_in_awesome_bar(TAB_1_INPUT)
+    nav.perform_key_combo_chrome(Keys.CONTROL, Keys.ENTER)
+    nav.url_contains(TAB_1_EXPECTED_DOMAIN)
+
+    first_tab_url = driver.current_url
+
+    # Open second tab and navigate using Ctrl+Enter
+    nav.open_and_switch_to_new_window("tab")
+    nav.type_in_awesome_bar(TAB_2_INPUT)
+    nav.perform_key_combo_chrome(Keys.CONTROL, Keys.ENTER)
+    nav.url_contains(TAB_2_EXPECTED_DOMAIN)
+
+    # Switch back to first tab
+    driver.switch_to.window(driver.window_handles[0])
+
+    # Refresh using Ctrl/Cmd + R
+    nav.refresh_page()
+
+    # Verify successful reload (same URL)
+    nav.url_contains(TAB_1_EXPECTED_DOMAIN)
+
+    assert driver.current_url == first_tab_url