merge main

Author: Hani Yacoub

SELECTOR_INFO.md

@@ -1381,6 +1381,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

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -0,0 +1,77 @@
+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 Utilities, BrowserActions
+
+
+
+@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/region/CA.json

@@ -6,6 +6,7 @@
         "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_ad_address_data_captured_in_doorhanger_and_stored.py",
         "test_demo_cc_dropdown-presence.py"
     ]
 }

l10n_CM/region/DE.json

@@ -6,6 +6,7 @@
         "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"
     ]
 }

l10n_CM/region/FR.json

@@ -6,6 +6,7 @@
         "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_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

l10n_CM/region/US.json

@@ -6,6 +6,7 @@
         "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_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

modules/data/autofill_popup.components.json

@@ -107,6 +107,42 @@
         "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(2) span",
         "strategy": "css",
         "groups": []
+    },
+
+    "address-doorhanger-street": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(3) span",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-city": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(1)",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-state": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(3)",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-zip": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(5)",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-zip-other": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(3)",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-country": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(5) span",
+        "strategy": "css",
+        "groups": []
     }
 }
 

modules/page_object_prefs.py

@@ -394,14 +394,14 @@ def click_popup_panel_button(self, field: str) -> BasePage:
             self.get_element("panel-popup-button", labels=[field]).click()
         return self
 
-    def select_https_only_setting(self, option_id: "HttpsOnlyStatus") -> BasePage:
+    def select_https_only_setting(self, option_id: HttpsOnlyStatus) -> BasePage:
         """
         Click the HTTPS Only option given
         """
         self.find_in_settings("HTTPS")
-        self.element_clickable(option_id)
-        self.click_on(option_id)
-        self.element_attribute_contains(option_id, "checked", "")
+        self.element_clickable(str(option_id))
+        self.click_on(str(option_id))
+        self.element_attribute_contains(str(option_id), "checked", "")
         return self
 
     def set_default_zoom_level(self, zoom_percentage: int) -> BasePage:

modules/testrail.py

@@ -160,6 +160,21 @@ def get_test_case(self, case_id):
         """Get a given Test Case"""
         return self.client.send_get(f"get_case/{case_id}")
 
+    def update_cases_in_suite(self, suite_id, case_ids, **kwargs):
+        """Given a suite and a list of test cases, update all listed
+        test cases according to keyword args"""
+        if not kwargs:
+            return None
+        return self.client.send_post(
+            f"update_cases/{suite_id}", {"case_ids": case_ids, **kwargs}
+        )
+
+    def update_test_case(self, case_id, **kwargs):
+        """Given a test case id, update according to keyword args"""
+        if not kwargs:
+            return None
+        return self.client.send_post(f"update_case/{case_id}", **kwargs)
+
     def create_test_run_on_plan_entry(
         self, plan_id, entry_id, config_ids, description=None, case_ids=None
     ):
@@ -235,6 +250,14 @@ def matching_plan_in_milestone(self, testrail_project_id, milestone_id, plan_nam
                 return self._get_full_plan(plan.get("id"))
         return None
 
+    def matching_custom_field(self, name):
+        """Given a name, return the case_field object that matches (name or label)"""
+        custom_fields = self._get_case_fields()
+        for field in custom_fields:
+            if name in field.get("name") or name in field.get("label"):
+                return field
+        return None
+
     def create_new_plan(
         self,
         testrail_project_id,
@@ -448,6 +471,9 @@ def _get_plans_in_milestone(self, testrail_project_id, milestone_id):
     def _get_full_plan(self, plan_id):
         return self.client.send_get(f"get_plan/{plan_id}")
 
+    def _get_case_fields(self):
+        return self.client.send_get("get_case_fields")
+
     def _retry_api_call(self, api_call, *args, max_retries=3, delay=5):
         """
         Retries the given API call up to max_retries times with a delay between attempts.

modules/util.py

@@ -394,6 +394,34 @@ def get_all_attributes(self, driver: Firefox, item: WebElement) -> str:
             ret_val += f"{attribute}: {value}\n"
         return ret_val
 
+    def get_state_province_abbreviation(self, full_name: str) -> str:
+        """
+        Returns the abbreviation for a given state, province, or region full name.
+
+        :param full_name: The full name of the state, province, or region.
+        :return: The corresponding abbreviation or "Not Found" if not in the dictionary.
+        """
+        state_province_abbr = {
+            # US States
+            "Alabama": "AL", "Alaska": "AK", "Arizona": "AZ", "Arkansas": "AR", "California": "CA",
+            "Colorado": "CO", "Connecticut": "CT", "Delaware": "DE", "Florida": "FL", "Georgia": "GA",
+            "Hawaii": "HI", "Idaho": "ID", "Illinois": "IL", "Indiana": "IN", "Iowa": "IA",
+            "Kansas": "KS", "Kentucky": "KY", "Louisiana": "LA", "Maine": "ME", "Maryland": "MD",
+            "Massachusetts": "MA", "Michigan": "MI", "Minnesota": "MN", "Mississippi": "MS", "Missouri": "MO",
+            "Montana": "MT", "Nebraska": "NE", "Nevada": "NV", "New Hampshire": "NH", "New Jersey": "NJ",
+            "New Mexico": "NM", "New York": "NY", "North Carolina": "NC", "North Dakota": "ND", "Ohio": "OH",
+            "Oklahoma": "OK", "Oregon": "OR", "Pennsylvania": "PA", "Rhode Island": "RI", "South Carolina": "SC",
+            "South Dakota": "SD", "Tennessee": "TN", "Texas": "TX", "Utah": "UT", "Vermont": "VT",
+            "Virginia": "VA", "Washington": "WA", "West Virginia": "WV", "Wisconsin": "WI", "Wyoming": "WY",
+
+            # Canadian Provinces
+            "Alberta": "AB", "British Columbia": "BC", "Manitoba": "MB", "New Brunswick": "NB",
+            "Newfoundland and Labrador": "NL", "Nova Scotia": "NS", "Ontario": "ON", "Prince Edward Island": "PE",
+            "Quebec": "QC", "Saskatchewan": "SK", "Northwest Territories": "NT", "Nunavut": "NU", "Yukon": "YT",
+        }
+
+        return state_province_abbr.get(full_name, "Not Found")
+
 
 class BrowserActions:
     """