Merge branch 'main' into philimon/suite_refactor

Author: philimon-reset

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

@@ -1368,6 +1368,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 +1395,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:

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -0,0 +1,94 @@
+import pytest
+from selenium.webdriver import Firefox
+
+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 BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888703"
+
+
+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
+    """
+    # instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+    browser_action_obj = BrowserActions(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)
+
+    # The "Save address?" doorhanger is displayed
+    address_autofill_popup.element_visible("address-save-doorhanger")
+
+    # containing Street Address field
+    expected_street_add = address_autofill_data.street_address
+    address_autofill_popup.element_has_text(
+        "address-doorhanger-street", expected_street_add
+    )
+
+    # containing City field
+    expected_city = address_autofill_data.address_level_2
+    address_autofill_popup.element_has_text("address-doorhanger-city", expected_city)
+
+    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
+        )
+
+    # 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"
+    )
+    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
+    )
+
+    # Click the "Save" button
+    address_autofill_popup.click_doorhanger_button("save")
+
+    # Navigate to about:preferences#privacy => "Autofill" section
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+    iframe = about_prefs.get_save_addresses_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+
+    # Verify saved addresses
+    elements = about_prefs.get_elements("saved-addresses-values")
+
+    # Expected values for verification
+    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
+    )
+    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_email_phone_captured_in_doorhanger_and_stored.py

@@ -0,0 +1,65 @@
+import pytest
+from selenium.webdriver import Firefox
+
+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 BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2886581"
+
+
+def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
+    driver: Firefox, region: str
+):
+    """
+    C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
+    """
+    # instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+    browser_action_obj = BrowserActions(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)
+
+    # The "Save address?" doorhanger is displayed
+    address_autofill_popup.element_visible("address-save-doorhanger")
+
+    # containing email field
+    expected_email = address_autofill_data.email
+    address_autofill_popup.element_has_text("address-doorhanger-email", expected_email)
+
+    # containing phone field
+    expected_phone = address_autofill_data.telephone
+    with driver.context(driver.CONTEXT_CHROME):
+        actual_phone = address_autofill_popup.get_element(
+            "address-doorhanger-phone"
+        ).text
+    normalize_expected = util.normalize_phone_number(expected_phone)
+    normalized_actual = util.normalize_phone_number(actual_phone)
+    assert normalized_actual == normalize_expected
+
+    # Click the "Save" button
+    address_autofill_popup.click_doorhanger_button("save")
+
+    # Navigate to about:preferences#privacy => "Autofill" section
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+    iframe = about_prefs.get_save_addresses_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+
+    # The address saved in step 2 is listed in the "Saved addresses" modal: Email and phone
+    elements = about_prefs.get_elements("saved-addresses-values")
+    expected_values = [expected_phone, expected_email]
+    found_email_phone = any(
+        all(value in element.text for value in expected_values) for element in elements
+    )
+    assert found_email_phone, (
+        "Email or phone were not found in any of the address entries!"
+    )

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -59,6 +59,6 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     found_name_org = any(
         all(value in element.text for value in expected_values) for element in elements
     )
-    assert (
-        found_name_org
-    ), "Name or organization were not found in any of the address entries!"
+    assert found_name_org, (
+        "Name or organization were not found in any of the address entries!"
+    )

l10n_CM/Unified/test_demo_cc_clear_form.py

@@ -0,0 +1,40 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object import AboutPrefs, CreditCardFill
+from modules.util import BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2886602"
+
+
+def test_cc_clear_form(driver: Firefox):
+    """
+    C2886602 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
+    field from which the clear action was triggered.
+    """
+
+    # Initialize objects
+    util = Utilities()
+    about_prefs = AboutPrefs(driver, category="privacy")
+    about_prefs_cc_popup = AboutPrefs(driver)
+    browser_action_obj = BrowserActions(driver)
+    credit_card_fill_obj = CreditCardFill(driver)
+    autofill_popup = AutofillPopup(driver)
+
+    # Save a credit card in about:preferences
+    about_prefs.open()
+    iframe = about_prefs.get_saved_payments_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+    credit_card_sample_data = util.fake_credit_card_data()
+    about_prefs_cc_popup.click_on(
+        "panel-popup-button", labels=["autofill-manage-add-button"]
+    )
+    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+
+    # Open credit card form page, clear form and verify all fields are empty
+    credit_card_fill_obj.open()
+    credit_card_fill_obj.verify_clear_form_all_fields(autofill_popup)

l10n_CM/region/CA.json

@@ -4,7 +4,10 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py",
+        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/DE.json

@@ -4,7 +4,10 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.py"
+        "test_demo_cc_dropdown-presence.py",
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/FR.json

@@ -5,6 +5,9 @@
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py",
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
         "test_demo_cc_dropdown-presence.py"
+        "test_demo_cc_clear_form.py"
     ]
 }