Merge branch 'main' into Hani/address_autofill_addresses_fields

Author: ben-c-at-moz

.github/workflows/check-devedition.yml

@@ -12,7 +12,8 @@ jobs:
   Check-DevEdition-Version:
     runs-on: ubuntu-latest
     outputs:
-      reportable: ${{ steps.reportable.outputs.test }}
+      win_reportable: ${{ steps.reportable.outputs.win }}
+      mac_reportable: ${{ steps.reportable.outputs.mac }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

SELECTOR_INFO.md

@@ -1389,6 +1389,13 @@ Location: Appears as part of the dropdown under the autofill panel, within any e
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
+Selector Name: select-form-option-by-index
+Selector Data: ".autocomplete-richlistbox .autocomplete-richlistitem:nth:child({index})"
+Description: Select n individual entry within the autofill dropdown, using the index of the child.
+Location: Appears as part of the dropdown under the autofill panel, within any eligible form field when suggestions are available.
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
 Selector Name: clear-form-option
 Selector Data: ".autocomplete-richlistbox .autocomplete-richlistitem[ac-value='Clear Autofill Form']"
 Description: The "Clear Autofill Form" option in the dropdown that appears when interacting with an autofill-enabled input field

collect_executables.py

@@ -103,6 +103,8 @@ def get_gd_platform():
         language = "en-US"
 
     if channel == "-devedition":
+        # Devedition has special requirements as it's testing a release
+
         this_devedition = BACKSTOP
         fx_download_dir_url = (
             "https://archive.mozilla.org/pub/devedition/releases/135.0b5/"
@@ -121,62 +123,60 @@ def get_gd_platform():
             fx_download_dir_url = next_candidate
 
         devedition_version = fx_download_dir_url.split("/")[-2]
-        if NUMBER_ONLY:
-            print(devedition_version)
-        else:
-            print(
-                f"{fx_download_dir_url}{get_fx_platform()}/{language}/Firefox%20{devedition_version}.{get_fx_executable_extension()}"
-            )
-        exit()
-
-    candidate_exists = True
-    this_beta = BACKSTOP
-    while candidate_exists:
-        (major, minor_beta) = this_beta.split(".")
-        (minor, beta) = minor_beta.split("b")
-        major = int(major)
-        minor = int(minor)
-        beta = int(beta)
-
-        next_major = f"{major + 1}.0b1"
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/build1/"
-        rs = requests.get(fx_download_dir_url)
-        if rs.status_code < 300:
-            latest_beta_ver = next_major
-            this_beta = next_major
-            continue
-
-        next_minor = f"{major}.{minor + 1}b1"
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/build1/"
-        rs = requests.get(fx_download_dir_url)
-        if rs.status_code < 300:
-            latest_beta_ver = next_minor
-            this_beta = next_minor
-            continue
+        fx_download_dir_url = f"{fx_download_dir_url}{get_fx_platform()}/{language}/"
 
-        next_beta = f"{major}.{minor}b{beta + 1}"
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/build1/"
-        rs = requests.get(fx_download_dir_url)
-        if rs.status_code < 300:
-            latest_beta_ver = next_beta
-            this_beta = next_beta
-            continue
-
-        candidate_exists = False
+    else:
+        # Anything but devedition
 
-    status = 200
-    build = 0
-    while status < 400 and build < 20:
-        build += 1
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/"
+        candidate_exists = True
+        this_beta = BACKSTOP
+        while candidate_exists:
+            (major, minor_beta) = this_beta.split(".")
+            (minor, beta) = minor_beta.split("b")
+            major = int(major)
+            minor = int(minor)
+            beta = int(beta)
+
+            next_major = f"{major + 1}.0b1"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/build1/"
+            rs = requests.get(fx_download_dir_url)
+            if rs.status_code < 300:
+                latest_beta_ver = next_major
+                this_beta = next_major
+                continue
+
+            next_minor = f"{major}.{minor + 1}b1"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/build1/"
+            rs = requests.get(fx_download_dir_url)
+            if rs.status_code < 300:
+                latest_beta_ver = next_minor
+                this_beta = next_minor
+                continue
+
+            next_beta = f"{major}.{minor}b{beta + 1}"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/build1/"
+            rs = requests.get(fx_download_dir_url)
+            if rs.status_code < 300:
+                latest_beta_ver = next_beta
+                this_beta = next_beta
+                continue
+
+            candidate_exists = False
+
+        status = 200
+        build = 0
+        while status < 400 and build < 20:
+            build += 1
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/"
+
+            # Fetch the page
+            response = requests.get(fx_download_dir_url)
+            status = response.status_code
 
-        # Fetch the page
-        response = requests.get(fx_download_dir_url)
-        status = response.status_code
+        # Correct build is the last one that didn't 404
+        build -= 1
+        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
 
-    # Correct build is the last one that didn't 404
-    build -= 1
-    fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
     response = requests.get(fx_download_dir_url)
     status = response.status_code
     response_text = None
@@ -206,8 +206,11 @@ def get_gd_platform():
 
     fx_download_executable_url = rf"{fx_download_dir_url}{executable_name}"
     if NUMBER_ONLY:
-        number_cand = fx_download_dir_url.split("/")[6]
-        number = number_cand.split("-")[0]
-        print(f"{number}-build{build}")
+        if channel == "-devedition":
+            print(devedition_version)
+        else:
+            number_cand = fx_download_dir_url.split("/")[6]
+            number = number_cand.split("-")[0]
+            print(f"{number}-build{build}")
     else:
         print(fx_download_executable_url)

collect_executables.sh

@@ -7,6 +7,7 @@ then
     curl -o Firefox.dmg -L "$(pipenv run python collect_executables.py)"
     hdiutil attach Firefox.dmg
 else
+    pipenv run python collect_executables.py
     curl -o firefox.tar.xz -L "$(pipenv run python collect_executables.py)"
     tar xf firefox.tar.xz
 fi

l10n_CM/Unified/test_demo_ad_yellow_highlight_address.py

@@ -0,0 +1,60 @@
+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 "2888564"
+
+
+def test_address_yellow_highlight_address_fields(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888564 - Verify the yellow highlight appears on autofilled fields for the address fields.
+    """
+
+    # Instantiate objects
+    address_autofill_popup = AutofillPopup(driver)
+
+    # 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
+    address_autofill_popup.click_doorhanger_button("save")
+
+    # Double click inside street address field and select a saved address entry from the dropdown
+    address_autofill.double_click("form-field", labels=["street-address"])
+
+    # Click on the first element from the autocomplete dropdown
+    first_item = address_autofill_popup.get_nth_element(1)
+    address_autofill_popup.click_on(first_item)
+
+    # Verify the address fields are highlighted
+    address_autofill.verify_field_yellow_highlights(
+        region=region,
+        fields_to_test=[
+            "street-address",
+            "address-level2",
+            "address-level1",
+            "postal-code",
+            "country",
+        ],
+        expected_highlighted_fields=[
+            "street-address",
+            "address-level2",
+            "address-level1",
+            "postal-code",
+            "country",
+        ],
+    )

l10n_CM/Unified/test_demo_ad_yellow_highlight.py renamed to l10n_CM/Unified/test_demo_ad_yellow_highlight_name_org.py

@@ -14,8 +14,8 @@ def test_case():
 def test_address_yellow_highlight_on_name_organization_fields(
     driver: Firefox,
     region: str,
-    util: Utilities,
     address_autofill: AddressFill,
+    util: Utilities,
     autofill_popup: AutofillPopup,
 ):
     """
@@ -30,7 +30,7 @@ def test_address_yellow_highlight_on_name_organization_fields(
     # Click the "Save" button
     autofill_popup.click_doorhanger_button("save")
 
-    # Double click inside phone field and select a saved address entry from the dropdown
+    # Double click inside name field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["name"])
 
     # Click on the first element from the autocomplete dropdown

l10n_CM/region/Unified.json

@@ -15,5 +15,8 @@
         "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/browser_object_autofill_popup.py

@@ -80,6 +80,20 @@ def get_nth_element(self, index: str | int) -> WebElement:
                 )
             )
 
+    def select_nth_element(self, index: int):
+        """
+        Select the nth element from the autocomplete list
+        Arguments:
+            index (int): The index of the element to retrieve (1-based)
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.expect(
+                EC.visibility_of(
+                    self.get_element("select-form-option-by-index", labels=[str(index)])
+                )
+            )
+            self.get_element("select-form-option-by-index", labels=[str(index)]).click()
+
     def get_primary_value(self, element: WebElement) -> str:
         """
         Get the primary value from the autocomplete element

modules/data/autofill_popup.components.json

@@ -61,6 +61,12 @@
          "groups": []
     },
 
+    "select-form-option-by-index": {
+        "selectorData": ".autocomplete-richlistbox .autocomplete-richlistitem:nth-child({index})",
+        "strategy":"css",
+        "groups": []
+    },
+
     "update-card-info-popup-button": {
         "selectorData": "button[label='Update existing card']",
         "strategy": "css",