merge main

Author: Hani Yacoub

.github/workflows/smoke.yml

@@ -23,6 +23,7 @@ env:
 
 jobs:
   Smoke-Windows:
+    if: ${{ inputs.job_to_run == 'Smoke-Windows' || github.event_name == 'pull_request' }}
     runs-on: windows-latest
     steps:
       - name: Create app token
@@ -116,6 +117,7 @@ jobs:
           name: artifacts-win
           path: artifacts-win
   Smoke-MacOS:
+    if: ${{ inputs.job_to_run == 'Smoke-MacOS' || github.event_name == 'pull_request' }}
     runs-on: macos-latest
     steps:
       - name: Create app token
@@ -151,11 +153,11 @@ jobs:
           rm ./pyproject.toml;
           mv ./ci_pyproject.toml ./pyproject.toml;
           pipenv install;
-          bash ./collect_executables.sh;
+          echo app_name=$(bash ./collect_executables.sh | xargs -0 ./parse_executables.sh) >> "$GITHUB_OUTPUT"
       - name: Run Smoke Tests in MacOS
         if: steps.setup.conclusion == 'success'
         env:
-          FX_EXECUTABLE: /Volumes/Firefox/Firefox.app/Contents/MacOS/firefox
+          FX_EXECUTABLE: /Volumes/${{ steps.setup.outputs.app_name }}/${{ steps.setup.outputs.app_name }}.app/Contents/MacOS/firefox
         run: |
           /Volumes/Firefox/Firefox.app/Contents/MacOS/firefox --version
           pipenv run python choose_ci_set.py

SELECTOR_INFO.md

@@ -2983,7 +2983,7 @@ Path to .json: modules/data/navigation.components.json
 ```
 ```
 Selector Name: search-mode-switcher-option
-Selector Data: toolbarbutton[label*='{title}']
+Selector Data: menuitem[label*='{title}']
 Description: Option by label in search mode list
 Location: Search mode of awesomebar
 Path to .json: modules/data/navigation.components.json

l10n_CM/Unified/test_demo_ad_autofill_address_fields.py

@@ -0,0 +1,45 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888563"
+
+
+def test_demo_ad_autofill_address_fields(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888563 - Verify Autofill functionality when selecting an entry from the dropdown for address fields
+    """
+    # Create fake data and fill it in
+    address_autofill.open()
+    address_autofill_data = util.fake_autofill_data(region)
+    address_autofill.save_information_basic(address_autofill_data)
+
+    # Click the "Save" button
+    autofill_popup.click_doorhanger_button("save")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = [
+        "street-address",
+        "address-level2",
+        "address-level1",  # This will be skipped for DE/FR
+        "postal-code",
+        "country",
+    ]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.autofill_and_verify(
+            autofill_popup, field, address_autofill_data, util
+        )

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -1,7 +1,6 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from l10n_CM.Unified.conftest import autofill_popup
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities

l10n_CM/Unified/test_demo_ad_preview_name_org.py

@@ -29,34 +29,11 @@ def test_demo_ad_preview_name_org(
     # Click the "Save" button
     autofill_popup.click_doorhanger_button("save")
 
-    # Double-click inside Name field and hover the mouse over any saved address entry in the dropdown (without selecting it).
-    address_autofill.double_click("form-field", labels=["name"])
-    # Get the first element from the autocomplete dropdown
-    first_item = autofill_popup.get_nth_element(1)
-    actual_value = autofill_popup.hover(first_item).get_primary_value(first_item)
-
-    # Get the primary value (name) from the first item in the dropdown and assert that the actual value matches the expected value
-    expected_name = address_autofill_data.name
-    assert expected_name == actual_value, (
-        f"Expected {expected_name}, but got {actual_value}"
-    )
-
-    # Double-click inside Name field and hover the mouse over any saved address entry in the dropdown (without selecting it).
-    address_autofill.double_click("form-field", labels=["organization"])
-    # Get the first element from the autocomplete dropdown
-    first_item = autofill_popup.get_nth_element(1)
-    actual_value = autofill_popup.hover(first_item).get_primary_value(first_item)
-
-    # Get the primary value (org) from the first item in the dropdown and assert that the actual value matches the expected value
-    expected_org = address_autofill_data.organization
-    assert expected_org == actual_value, (
-        f"Expected {expected_org}, but got {actual_value}"
-    )
-
     fields_to_test = [
         "name",
         "organization"
     ]
 
     for field in fields_to_test:
-        address_autofill.verify_autofill_preview(field, )
+        address_autofill.verify_autofill_preview(field, address_autofill_data.name)
+        address_autofill.verify_autofill_preview(field, address_autofill_data.organization)

l10n_CM/Unified/test_demo_cc_add_new_credit_card.py

@@ -3,7 +3,6 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from l10n_CM.Unified.conftest import region
 from modules.page_object import AboutPrefs
 from modules.util import Utilities
 

l10n_CM/Unified/test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py

@@ -1,7 +1,6 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from l10n_CM.Unified.conftest import region
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import CreditCardFill
 from modules.page_object_prefs import AboutPrefs

l10n_CM/region/Unified.json

@@ -13,6 +13,8 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_dropdown-presence.py",
         "test_demo_cc_yellow_highlight.py",
+        "test_demo_ad_yellow_highlight.py",
+        "test_demo_ad_autofill_address_fields.py",
         "test_demo_ad_yellow_highlight_name_org.py",
         "test_demo_ad_yellow_highlight_address.py",
         "test_demo_ad_yellow_highlight_phone_email.py",

modules/data/navigation.components.json

@@ -130,7 +130,7 @@
     },
 
     "search-mode-switcher-option": {
-        "selectorData": "toolbarbutton[label*='{title}']",
+        "selectorData": "menuitem[label*='{title}']",
         "strategy": "css",
         "groups": []
     },
@@ -164,6 +164,7 @@
     },
 
     "sponsored-suggestion": {
+        "doNotCache": true,
         "selectorData": "urlbarView-row-body-description",
         "strategy": "class",
         "groups": []

modules/page_object_autofill.py

@@ -515,7 +515,9 @@ def verify_autofill_data(
             "ZIP Code": autofill_data.postal_code,
             "Country": autofill_data.country,
             "Email": autofill_data.email,
-            "Phone": util.normalize_phone_number(autofill_data.telephone),
+            "Phone": util.normalize_regional_phone_numbers(
+                autofill_data.telephone, region
+            ),
         }
 
         # Validate each field
@@ -528,7 +530,7 @@ def verify_autofill_data(
 
             # Normalize phone numbers before comparison
             if field == "Phone":
-                actual = util.normalize_phone_number(actual)
+                actual = util.normalize_regional_phone_numbers(actual, region)
 
             assert actual == expected, (
                 f"Mismatch in {field}: Expected '{expected}', but got '{actual}'"
@@ -549,6 +551,45 @@ def verify_field_yellow_highlights(
             expected_highlighted_fields=expected_highlighted_fields,
         )
 
+    def autofill_and_verify(
+        self, address_autofill_popup, field_label, address_autofill_data, util
+    ):
+        """
+        Autofills a form field, verifies the data, and clears it if necessary.
+        Parameters:
+        ----------
+        address_autofill : AddressFill
+            The address autofill handler.
+        address_autofill_popup : AutofillPopup
+            The popup handler for autofill suggestions.
+        field_label : str
+            The label of the field being autofilled.
+        address_autofill_data : dict
+            The generated autofill data for verification.
+        region : str
+            The region code to handle localization.
+        """
+        # Skip address-level1 (State) selection for DE and FR
+        if field_label == "address-level1" and address_autofill_data.country in [
+            "DE",
+            "FR",
+        ]:
+            return
+
+        # Double-click a field and choose the first element from the autocomplete dropdown
+        self.double_click("form-field", labels=[field_label])
+        first_item = address_autofill_popup.get_nth_element(1)
+        address_autofill_popup.click_on(first_item)
+
+        # Verify autofill data
+        self.verify_autofill_data(
+            address_autofill_data, address_autofill_data.country, util
+        )
+
+        # Clear form autofill
+        self.double_click("form-field", labels=[field_label])
+        address_autofill_popup.click_clear_form_option()
+
     def verify_autofill_preview(self, field_label: str, expected_value: str):
         """Reusable method to verify autofill preview for a given field."""
         self.double_click("form-field", labels=[field_label])