merge main

Author: Hani Yacoub

SELECTOR_INFO.md

@@ -12,7 +12,7 @@ Path to .json: (ie, modules/data/google_search.components.json
 ```
 Selector Name: sidebar-options
 Selector Data: "button.category[name='{name}']"
-Description: Selects an option in about:addons (sidebar)
+Description: Selects an option in about:addons(sidebar)
 Location: Left side of about:addons page
 Path to .json: modules/data/about_addons.components.json
 ```
@@ -459,6 +459,20 @@ Location: about:preferences#search
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: form-container
+Selector Data: "form"
+Description: Form to to fill in saved addresses data
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: save-button
+Selector Data: "save"
+Description: Button to save filled in address form.
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: find-in-settings
 Selector Data: "searchInput"
 Description: Find in Settings input field (is a shadow root)
@@ -963,6 +977,20 @@ Location: about:preferences#privacy in Exceptions - Saved Passwords modal
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: actions-menu
+Selector Data: "richlistitem[type='{.*}'] menulist.actionsMenu"
+Description: Select Application list that handles how downloads are handled
+Location: about:preferences#general Applications subsection
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: actions-menu-option
+Selector Data: "richlistitem[type='{.*}'] menuitem[label='{.*}']"
+Description: Select download option from Application List
+Location: about:preferences#general Applications subsection
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: use-primary-password
 Selector Data: "useMasterPassword"
 Description: Checkbox for using primary password
@@ -1333,6 +1361,13 @@ Location: Inside any autofill-eligible form field, triggered by user interaction
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
+Selector Name: address-preview-form-container
+Selector Data: "address-save-update-notification-content"
+Description: Form container that is hidden in chrome context. Used to verify hover preview data
+Location: Inside chrome context, holds the data that would be showed as a preview when autofill is hovered.
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
 Selector Name: doorhanger-save-button
 Selector Data: button[label='Save'].popup-notification-primary-button
 Description: The "Save" button 
@@ -2142,6 +2177,13 @@ Location: any element that supports the attribute (usually text)
 Path to .json: modules/data/generic_pdf.components.json
 ```
 ```
+Selector Name: pdf-text-layer
+Selector Data: "textLayer"
+Description: first instance of a text span.
+Location: any element that supports the attribute (usually text)
+Path to .json: modules/data/generic_pdf.components.json
+```
+```
 Selector Name: html-body
 Selector Data: "html"
 Description: The html tag of the pdf

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -56,15 +56,17 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     autofill_popup.element_has_text(zip_selector, expected_zip)
 
     # Containing Country field
-    expected_country = address_autofill_data.country
+    expected_country = address_autofill_data.country_code
 
     autofill_popup.element_has_text("address-doorhanger-country", expected_country)
 
     # Click the "Save" button
+
     autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
     about_prefs_privacy.open()
+    about_prefs_privacy.get_saved_addresses_popup().click()
     about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # Verify saved addresses

l10n_CM/Unified/test_demo_ad_autofill_dropdown_present_for_email_and_phone.py

@@ -12,11 +12,11 @@ def test_case():
 
 
 def test_dropdown_presence_email_phone_field(
-        driver: Firefox,
-        region: str,
-        address_autofill: AddressFill,
-        util: Utilities,
-        autofill_popup: AutofillPopup,
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888567 - Verify that the autofill dropdown is displayed for the email and phone fields

l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py

@@ -42,10 +42,8 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     if expected_phone:
         with driver.context(driver.CONTEXT_CHROME):
             actual_phone = autofill_popup.get_element("address-doorhanger-phone").text
-        normalize_expected = util.normalize_regional_phone_numbers(
-            expected_phone, region
-        )
-        normalized_actual = util.normalize_regional_phone_numbers(actual_phone, region)
+        normalize_expected = util.normalize_phone_number(expected_phone, region)
+        normalized_actual = util.normalize_phone_number(actual_phone, region)
         assert normalized_actual == normalize_expected, (
             f"Phone number mismatch for {region} | Expected: {normalize_expected}, Got: {normalized_actual}"
         )
@@ -55,6 +53,7 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
 
     # Navigate to about:preferences#privacy => "Autofill" section
     about_prefs_privacy.open()
+    about_prefs_privacy.get_saved_addresses_popup().click()
     about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # The address saved in step 2 is listed in the "Saved addresses" modal: Email and phone

l10n_CM/Unified/test_demo_ad_hover_verify_address.py

@@ -0,0 +1,53 @@
+import logging
+
+import pytest
+from selenium.webdriver import ActionChains, 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
+
+
+@pytest.fixture()
+def test_case():
+    return "2888562"
+
+
+@pytest.fixture()
+def add_to_prefs_list(region: str):
+    return [
+        ("extensions.formautofill.creditCards.supportedCountries", region),
+        ("extensions.formautofill.addresses.supported", "on"),
+    ]
+
+
+def test_hover_address_is_previewed(
+    driver: Firefox,
+    region: str,
+    about_prefs_privacy: AboutPrefs,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+):
+    """
+    C2888562: Verify that hovering over field will preview all 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")
+    # Hover over each field and check data preview
+    for field in AddressFill.fields:
+        # hack to pass over fields that don't show up in autofill dropdown
+        if field == "address-level1" and region in ["DE", "FR"]:
+            continue
+        address_autofill.double_click("form-field", labels=[field])
+        autofill_popup.ensure_autofill_dropdown_visible()
+        autofill_popup.hover("select-form-option")
+        address_autofill.verify_autofill_data_on_hover(
+            address_autofill_data, autofill_popup, util
+        )

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -44,6 +44,7 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
 
     # Navigate to about:preferences#privacy => "Autofill" section
     about_prefs_privacy.open()
+    about_prefs_privacy.get_saved_addresses_popup().click()
     about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization

l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -12,11 +12,6 @@ def test_case():
     return "2886580"
 
 
-@pytest.fixture()
-def region():
-    return "US"
-
-
 @pytest.fixture()
 def add_to_prefs_list(region: str):
     return [
@@ -38,23 +33,25 @@ def test_verify_new_address_is_added(
 
     # open saved addresses and add entry
     about_prefs_privacy.open()
+    about_prefs_privacy.get_saved_addresses_popup().click()
     about_prefs_privacy.add_entry_to_saved_addresses(address_autofill_data)
+    about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # verify that the address saved is the same.
     # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization
     elements = about_prefs_privacy.get_element("saved-addresses-values").text.split(",")
     address_match = all(
-        data_sanitizer(element, region, inverted_state_province_abbr)
+        data_sanitizer(util, element, region, inverted_state_province_abbr)
         in address_autofill_data.__dict__.values()
         for element in elements
     )
     assert address_match, "Address found is not equal to address created!"
 
 
-def data_sanitizer(value: str, region: str, state_province: Dict):
+def data_sanitizer(util: Utilities, value: str, region: str, state_province: Dict):
     value = value.strip()
     if value[0] == "+":
-        return value[1:]
+        return util.normalize_phone_number(value)
     elif len(value) == 2 and value != region:
         return state_province.get(value, value)
     return value

l10n_CM/Unified/test_demo_ad_yellow_highlight_address.py

@@ -21,24 +21,20 @@ def test_address_yellow_highlight_address_fields(
     """
     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")
+    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)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify the address fields are highlighted
     address_autofill.verify_field_yellow_highlights(

l10n_CM/region/US.json

@@ -1,7 +1,4 @@
 {
     "region": "US",
-    "tests": [
-        "test_demo_ad_verify_new_address_added.py",
-        "test_demo_ad_autofill_dropdown_present_for_email_and_phone.py"
-    ]
+    "tests": []
 }

l10n_CM/region/Unified.json

@@ -1,31 +1,29 @@
 {
   "tests": [
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_autofill_name_org.py",
-        "test_demo_ad_autofill_phone_email.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_ad_verify_new_address_added.py",
-        "test_demo_cc_add_new_credit_card.py",
-        "test_demo_cc_clear_form.py",
-        "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_dropdown_presence.py",
-        "test_demo_cc_autofill_from_dropdown.py",
-        "test_demo_cc_yellow_highlight.py",
-        "test_demo_ad_autofill_address_fields.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",
-        "test_demo_ad_dropdown_presence_address.py",
-        "test_demo_ad_clear_name_org.py",
-        "test_demo_ad_clear_address_fields.py",
-        "test_demo_ad_clear_tel_email.py",
-        "test_demo_ad_yellow_highlight_phone_email.py",
-        "test_demo_ad_preview_name_org.py"
-
+    "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_autofill_name_org.py",
+    "test_demo_ad_autofill_phone_email.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_ad_verify_new_address_added.py",
+    "test_demo_cc_add_new_credit_card.py",
+    "test_demo_cc_clear_form.py",
+    "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
+    "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
+    "test_demo_cc_dropdown_presence.py",
+    "test_demo_cc_autofill_from_dropdown.py",
+    "test_demo_cc_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",
+    "test_demo_ad_dropdown_presence_address.py",
+    "test_demo_ad_clear_name_org.py",
+    "test_demo_ad_clear_address_fields.py",
+    "test_demo_ad_clear_tel_email.py",
+    "test_demo_ad_autofill_dropdown_present_for_email_and_phone.py",
+    "test_demo_ad_hover_verify_address.py",
+    "test_demo_ad_preview_name_org.py"
   ]
 }