Merge branch 'main' into vs/CC-doorhanger-data-is-saved

Author: vsangereanMOZ

Pipfile

@@ -17,7 +17,7 @@ taskcluster-taskgraph = "==9.0.0"
 jsonpath-ng = "1.6.1"
 pillow = "<10.5"
 pyfxa = "0.7.0"
-ruff = "0.5.2"
+ruff = "0.9.6"
 pytest-rerunfailures = "14.0"
 slack-sdk = "3.31.0"
 google-cloud-storage = "2.18.0"

SELECTOR_INFO.md

@@ -1196,6 +1196,69 @@ Description: "Submit" button
 Location: At the bottom of the autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
 Path to .json: modules/data/address_fill.components.json
 ```
+```
+Selector Name: name-field
+Selector Data: "input[autocomplete=name]"
+Description: Name field
+Location: Name field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: org-field
+Selector Data: "input[autocomplete=organization]"
+Description: Organization field
+Location: Organization field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: street-field
+Selector Data: "input[autocomplete=street-address]"
+Description: Street field
+Location: Street field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: add-level2-field
+Selector Data: "input[autocomplete=address-level2]"
+Description: Address level 2 field
+Location: Address level 2 field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: add-level1-field
+Selector Data: "input[autocomplete=address-level1]"
+Description: Address level 1 field
+Location: Address level 1 field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: zip-field
+Selector Data: "input[autocomplete=postal-code]"
+Description: Zip field
+Location: Zip field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: country-field
+Selector Data: "input[autocomplete=country]"
+Description: Country field
+Location: Country field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: email-field
+Selector Data: "input[autocomplete=email]"
+Description: Email field
+Location: Email field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: phone-field
+Selector Data: "input[autocomplete=tel]"
+Description: Phone field
+Location: Phone field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
 #### amo_languages
 ```
 Selector Name: language-addons-title
@@ -1368,6 +1431,20 @@ Location: Address bar
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
+Selector Name: address-doorhanger-email
+Selector Data: "div.address-save-update-row-container:nth-of-type(2) div p:first-of-type span"
+Description: Save address doorhanger email section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-phone
+Selector Data: "div.address-save-update-row-container:nth-of-type(2) div p:nth-of-type(2) span"
+Description: Save address doorhanger phone section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
 Selector Name: address-doorhanger-name
 Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:first-of-type span"
 Description: Save address doorhanger name section
@@ -1381,6 +1458,48 @@ Description: Save address doorhanger organization section
 Location: Address bar
 Path to .json: modules/data/autofill_popup.components.json
 ```
+```
+Selector Name: address-doorhanger-street
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(3) span"
+Description: Save address doorhanger street address section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-city
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(1)"
+Description: Save address doorhanger city section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-state
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(3)"
+Description: Save address doorhanger state section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-zip
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(5)"
+Description: Save address doorhanger zip section for US and CA
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-zip-other
+Selector Data: "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(3)",
+Description: Save address doorhanger zip section for other regions
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-country
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(5) span"
+Description: Save address doorhanger country section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
 #### context_menu
 ```
 Selector Name: context-menu-search-selected-text

collect_executables.py

@@ -111,23 +111,23 @@ def get_gd_platform():
         minor = int(minor)
         beta = int(beta)
 
-        next_major = f"{major+1}.0b1"
+        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"
+        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}"
+        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:
@@ -152,8 +152,17 @@ def get_gd_platform():
     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
-    if status < 300:
-        response_text = response.text
+    response_text = None
+    for _ in range(3):
+        if status < 300:
+            response_text = response.text
+        else:
+            sleep(3)
+            response = requests.get(fx_download_dir_url)
+            status = response.status_code
+
+    if response_text is None:
+        exit(f"Could not find build at {fx_download_dir_url}.")
 
     # Parse the HTML content
     soup = BeautifulSoup(response_text, "html.parser")

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -4,16 +4,19 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities, BrowserActions
-
+from modules.util import BrowserActions, Utilities
 
 
 @pytest.fixture()
 def test_case():
     return "2888703"
 
 
-def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox, region: str):
+
+def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
+    driver: Firefox, region: str
+):
+
     """
     C2888703 - Verify Address data are captured in the Capture Doorhanger and stored in about:preferences
     """
@@ -33,7 +36,10 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox,
 
     # containing Street Address field
     expected_street_add = address_autofill_data.street_address
-    address_autofill_popup.element_has_text("address-doorhanger-street", expected_street_add)
+
+    address_autofill_popup.element_has_text(
+        "address-doorhanger-street", expected_street_add
+    )
 
     # containing City field
     expected_city = address_autofill_data.address_level_2
@@ -42,16 +48,26 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox,
     expected_state = address_autofill_data.address_level_1
     if region not in ["FR", "DE"]:
         state_abbreviation = util.get_state_province_abbreviation(expected_state)
-        address_autofill_popup.element_has_text("address-doorhanger-state", state_abbreviation)
+        address_autofill_popup.element_has_text(
+            "address-doorhanger-state", state_abbreviation
+        )
 
     # Verify Zip Code field (Different selector for DE/FR)
     expected_zip = address_autofill_data.postal_code
-    zip_selector = "address-doorhanger-zip-other" if region in ["FR", "DE"] else "address-doorhanger-zip"
+    zip_selector = (
+        "address-doorhanger-zip-other"
+        if region in ["FR", "DE"]
+        else "address-doorhanger-zip"
+    )
+    
     address_autofill_popup.element_has_text(zip_selector, expected_zip)
 
     # containing Country field
     expected_country = address_autofill_data.country
-    address_autofill_popup.element_has_text("address-doorhanger-country", expected_country)
+
+    address_autofill_popup.element_has_text(
+        "address-doorhanger-country", expected_country
+    )
 
     # Click the "Save" button
     address_autofill_popup.click_doorhanger_button("save")
@@ -65,13 +81,20 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox,
     elements = about_prefs.get_elements("saved-addresses-values")
 
     # Expected values for verification
-    expected_values = [expected_street_add, expected_city, expected_zip, expected_country]
+    expected_values = [
+        expected_street_add,
+        expected_city,
+        expected_zip,
+        expected_country,
+    ]
     if region not in ["FR", "DE"]:
         expected_values.insert(2, expected_state)
 
     # Check if all expected values exist in any saved address
     found_address_data = any(
-        all(value in element.text for value in expected_values)
-        for element in elements
+        all(value in element.text for value in expected_values) for element in elements
     )
-    assert found_address_data, "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"
+    assert found_address_data, (
+        "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"
+    )
+

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -0,0 +1,53 @@
+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 "2888558"
+
+
+def test_demo_ad_autofill_name_org(driver: Firefox, region: str):
+    """
+    C2888558 - Verify Autofill functionality when selecting an entry from the dropdown for name/org fields
+    """
+    # Instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+
+    # 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 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
+    first_item = address_autofill_popup.get_nth_element(1)
+    address_autofill_popup.click_on(first_item)
+
+    # Verify autofill data
+    address_autofill.verify_autofill_data(address_autofill_data, region, util)
+
+    # Double inside Name field and select clear form autofill
+    address_autofill.double_click("form-field", labels=["name"])
+    address_autofill_popup.click_clear_form_option()
+
+    # Double inside Organization field and select a saved address entry from the dropdown
+    address_autofill.double_click("form-field", labels=["organization"])
+
+    # 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 autofill data
+    address_autofill.verify_autofill_data(address_autofill_data, region, util)