Merge branch 'mozilla:main' into test-play-mute-unmute-tabs-via-toggle

Author: krishpdev

.github/workflows/smoke.yml

@@ -107,7 +107,7 @@ jobs:
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
           pipenv run python choose_ci_set.py
-          pipenv run pytest $(cat selected_tests)
+          pipenv run pytest --geckodriver geckodriver.exe $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           mv artifacts artifacts-win || true
           exit $env:TEST_EXIT_CODE
@@ -120,7 +120,7 @@ jobs:
           mv ./ci_pyproject_headed.toml ./pyproject.toml;
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           pipenv run python choose_ci_set.py
-          pipenv run pytest $(cat selected_tests)
+          pipenv run pytest --geckodriver geckodriver.exe $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           rm artifacts/assets -r -Force
           Get-ChildItem -Path "artifacts" | ForEach-Object {

SELECTOR_INFO.md

@@ -443,6 +443,14 @@ Description: The Firefox logo
 Location: The about:newtab page
 Path to .json: modules/data/about_newtab.components.json
 ```
+```
+Selector Name: top-site-by-title
+Selector Data: "//li[@class='top-site-outer']//span[@class='title-label' and text()='{title}']/.."
+Description: Topsite tile by title
+Location: The about:newtab page (middle section)
+Path to .json: modules/data/about_newtab.components.json
+```
+
 #### about_prefs
 ```
 Selector Name: search-engine-dropdown-root
@@ -495,22 +503,50 @@ Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: save-and-fill-addresses
-Selector Data: "checkbox[label='Save and fill addresses']"
+Selector Data: "[data-l10n-id='autofill-addresses-checkbox-message']"
 Description: Label for Autofill > Save and fill addresses option
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: save-and-fill-payment-methods
-Selector Data: "checkbox[label='Save and fill payment methods']"
+Selector Data: "[data-l10n-id='autofill-payment-methods-checkbox-message-2']"
 Description: Label for Autofill > Save and fill payment methods option
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: prefs-button
+Selector Data: "moz-box-button[label^='{name}']"
+Description: Checkbox for a option by label of moz box button
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: action-button
 Selector Data: "button[label^='{name}']"
-Description: Checkbox for a option by label
+Description: Checkbox for a option by label of normal button
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: close-dialog
+Selector Data: "button[data-l10n-id='close-button']"
+Description: Close dialog button
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: saved-payments-button
+Selector Data: "[data-l10n-id='autofill-payment-methods-manage-payments-button']"
+Description: Embedded button/label for "Manage Saved Payments"
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: saved-addresses-button
+Selector Data: "[data-l10n-id='autofill-addresses-manage-addresses-button']"
+Description: Embedded button/label for "Manage Addresses and more..."
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
 ```
@@ -845,7 +881,7 @@ Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: cookies-privacy-label
-Selector Data: "description[data-l10n-id='sitedata-delete-on-close-private-browsing2']"
+Selector Data: "[data-l10n-id='sitedata-delete-on-close-private-browsing3']"
 Description: Message in Cookies and Site data when History is not remembered
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
@@ -907,6 +943,13 @@ Location: about:preferences#general Language subsection
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: search-suggestion-in-private-windows
+Selector Data: "showSearchSuggestionsPrivateWindows"
+Description: Show search suggestions in Private Windows
+Location: about:preferences#search
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: language-settings-search
 Selector Data: "menuitem[value='search']"
 Description: In the Language Set Alternatives dialog, the Select a language to add, Search for more languages… option
@@ -1151,6 +1194,13 @@ Description: The dropdown menu for default zoom selection
 Location: about:preferences - Zoom settings
 Path to .json: modules/data/about_prefs.components.json
 ```
+```
+Selector Name: unknown-content-type-dialog
+Selector Data: unknownContentTypeWindo
+Description: The unknown content type dialog
+Location: about:preferences#general Applications subsection
+Path to .json: modules/data/about_prefs.components.json
+```
 #### about_profiles
 ```
 Selector Name: profile-container
@@ -1788,6 +1838,27 @@ Description: Open all bookmarks from the context menu option from a Toolbar book
 Location: Context menu - Toolbar
 Path to .json: modules/data/context_menu.components.json
 ```
+```
+Selector Name: context-menu-move-tab-to-start
+Selector Data: menuitem[data-l10n-id='move-to-start']
+Description: Context menu option to move a tab to the start of the tab bar.
+Location: Context menu - Tab
+Path to .json: modules/data/context_menu.components.json
+```
+```
+Selector Name: context-menu-bookmark-link
+Selector Data: context-bookmarklink
+Description: Context menu option to bookmark a link
+Location: Context menu - topsite context menu
+Path to .json: modules/data/context_menu.components.json
+```
+```
+Selector Name: context-menu-search-select
+Selector Data: coontext-searchselect
+Description: Context menu option to search selected text with the engine set as default
+Location: Context menu - topsite context menu
+Path to .json: modules/data/context_menu.components.json
+```
 #### credit_card_fill
 ```
 Selector Name: form-field
@@ -1819,9 +1890,9 @@ Location: Any non-linked content space inside example.com page
 Path to .json: modules/data/exemple_page.components.json
 ```
 ```
-Selector Name: more-information
-Selector Data: "More information..."
-Description: More information..." link 
+Selector Name: learn-more
+Selector Data: "Learn more"
+Description: "Learn more" link
 Location: The hyperlink positioned in the middle of example.com page  
 Path to .json: modules/data/exemple_page.components.json
 ```
@@ -2797,6 +2868,27 @@ Location: Download panel
 Path to .json: modules/data/navigation.components.json
 ```
 ```
+Selector name: download-target-element
+Selector Data: downloadTarget
+Description: Downloaded item in the download panel
+Location: Download panel
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector name: download-progress-element
+Selector Data: downloadProgress
+Description: Download progress bar
+Location: Download panel
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector name: ddownload-details-element
+Selector Data: downloadDetailsNormal
+Description: Download details element
+Location: Download panel
+Path to .json: modules/data/navigation.components.json
+```
+```
 Selector name: remove-bookmark-button
 Selector Data: editBookmarkPanelRemoveButton
 Description: Remove bookmark button
@@ -3069,6 +3161,13 @@ Description: Developer tool icon
 Location: Navigation bar
 Path to .json: modules/data/navigation.components.json
 ```
+```
+Selector Name: status-panel-label
+Selector Data: statuspanel-label
+Description: Status panel URL label
+Location: newtab page bottom left corner on link hover
+Path to .json: modules/data/navigation.components.json
+```
 #### panel_ui
 ```
 Selector name: panel-ui-button
@@ -3446,7 +3545,7 @@ Description: Edit bookmark panel
 Location: Bookmark panel
 Path to .json: modules/data/pane_ui.components.json
 ```
-```
+
 #### print_preview
 ```
 Selector name: print-preview-browser

conftest.py

@@ -8,12 +8,14 @@
 from subprocess import check_output, run
 from typing import Callable, List, Tuple, Union
 
+# import psutil
 import pytest
 from PIL import Image, ImageGrab
 from selenium.common.exceptions import TimeoutException, WebDriverException
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.firefox.service import Service
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -132,6 +134,13 @@ def pytest_addoption(parser):
         help="Path to Fx executable. Will overwrite --fx-channel.",
     )
 
+    parser.addoption(
+        "--geckodriver",
+        action="store",
+        default="",
+        help="Path to geckodriver.",
+    )
+
     parser.addoption(
         "--run-headless",
         action="store_true",
@@ -216,12 +225,17 @@ def sys_platform():
     return platform.system()
 
 
+@pytest.fixture(scope="session")
+def geckodriver(request):
+    return request.config.getoption("--geckodriver")
+
+
 @pytest.fixture()
 def downloads_folder(sys_platform):
     """Return the downloads folder location for this OS"""
     if sys_platform == "Windows":
         user = os.environ.get("USERNAME")
-        return f"C:\\Users\\{user}\\Downloads"
+        return rf"C:\Users\{user}\Downloads"
     elif sys_platform == "Darwin":  # MacOS
         user = os.environ.get("USER")
         return f"/Users/{user}/Downloads"
@@ -242,11 +256,11 @@ def fx_executable(request, sys_platform):
     location = ""
     if sys_platform == "Windows":
         if version == "Firefox":
-            location = "C:\\Program Files\\Mozilla Firefox\\firefox.exe"
+            location = r"C:\Program Files\Mozilla Firefox\firefox.exe"
         elif version == "Nightly":
-            location = "C:\\Program Files\\Firefox Nightly\\firefox.exe"
+            location = r"C:\Program Files\Firefox Nightly\firefox.exe"
         elif version == "Custom":
-            location = "C:\\Program Files\\Custom Firefox\\firefox.exe"
+            location = r"C:\Program Files\Custom Firefox\firefox.exe"
     elif sys_platform == "Darwin":
         if version == "Firefox":
             location = "/Applications/Firefox.app/Contents/MacOS/firefox"
@@ -392,6 +406,7 @@ def hard_quit():
 @pytest.fixture(autouse=True)
 def driver(
     fx_executable: str,
+    geckodriver: str,
     opt_headless: bool,
     opt_implicit_timeout: int,
     prefs_list: List[Tuple],
@@ -457,7 +472,15 @@ def driver(
             options.profile = profile_path
         for opt, value in prefs_list:
             options.set_preference(opt, value)
-        driver = Firefox(options=options)
+        if geckodriver:
+            service = Service(executable_path=geckodriver)
+            driver = Firefox(service=service, options=options)
+        else:
+            driver = Firefox(options=options)
+        # Uncomment below to find Fx process info
+        # for proc in psutil.process_iter(["name", "exe", "cmdline"]):
+        #    if proc.info["name"] and "firefox" in proc.info["name"].lower():
+        #        print(proc.info)
         separator = "x"
         if separator not in opt_window_size:
             if "by" in opt_window_size:

l10n_CM/Unified/conftest.py

@@ -64,6 +64,8 @@ def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
         ("extensions.formautofill.addresses.supportedCountries", region),
         ("browser.aboutConfig.showWarning", False),
         ("browser.search.region", region),
+        ("extensions.formautofill.addresses.enabled", True),
+        ("extensions.formautofill.creditCards.enabled", True),
     ]
     prefs.extend(add_to_prefs_list)
     return prefs

modules/browser_object_context_menu.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Union
+from typing import Dict, List, Union
 
 from selenium.webdriver.remote.webelement import WebElement
 
@@ -13,15 +13,51 @@ class ContextMenu(BasePage):
 
     URL_TEMPLATE = ""
 
+    @BasePage.context_chrome
     def click_context_item(
         self, reference: Union[str, tuple, WebElement], labels=[]
     ) -> BasePage:
         """
         Clicks the context item.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.fetch(reference, labels=labels).click()
-            return self
+
+        self.fetch(reference, labels=labels).click()
+        return self
+
+    @BasePage.context_chrome
+    def verify_topsites_tile_context_menu_options(
+        self,
+        static_items: Dict[str, str],
+        dynamic_items: List[str],
+        tile_title: str,
+    ):
+        """
+        Verifies expected context menu options are present upon right clicking a topsite tile.
+        Arguments:
+            static_items: Dict mapping of selector name to expected label text.
+            dynamic_items: List of selector names for items with dynamic labels.
+            tile_title: Optional, required if dynamic label validation is needed (e.g., Wikipedia, YouTube).
+        """
+        # --- Static items ---
+        for selector, expected_label in static_items.items():
+            option = self.get_element(selector)
+            label = (option.get_attribute("label") or option.text or "").strip()
+            assert expected_label in label, (
+                f'Expected label "{expected_label}" not found. Got: "{label}"'
+            )
+
+        # --- Dynamic items ---
+        for selector in dynamic_items:
+            option = self.get_element(selector)
+            label = (option.get_attribute("label") or option.text or "").strip()
+            normalized = label.lower()
+            assert normalized.startswith("search"), (
+                f'Label does not start with "Search": "{label}"'
+            )
+            assert "for" in normalized, f'"for" not found in label: "{label}"'
+            assert tile_title.lower() in normalized, (
+                f'Search term "{tile_title}" not found in label: "{label}"'
+            )
 
 
 class AboutDownloadsContextMenu(ContextMenu):