Merge pull request #471 from mozilla/as/cc-clear-form

Anca/l10n - CC clear form

Author: soncuteanca

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -4,16 +4,17 @@
 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 +34,9 @@ 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 +45,24 @@ 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 +76,17 @@ 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_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

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

l10n_CM/region/DE.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_address_data_captured_in_doorhanger_and_stored.py"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_clear_form.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_address_data_captured_in_doorhanger_and_stored.py"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_clear_form.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_address_data_captured_in_doorhanger_and_stored.py"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_clear_form.py"
     ]
 }

modules/browser_object_autofill_popup.py

@@ -49,8 +49,7 @@ def click_autofill_form_option(self) -> BasePage:
 
     def click_clear_form_option(self) -> BasePage:
         """Clicks to clear the saved form option (address or credit card)"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("clear-form-option").click()
+        self.click_on("clear-form-option")
         return self
 
     # Interaction with autocomplete list elements

modules/page_object_autofill.py

@@ -303,6 +303,23 @@ def update_cc_exp_year(
         )
         return self
 
+    def verify_clear_form_all_fields(self, autofill_popup_obj: AutofillPopup):
+        """
+        Clears all fields in the form by triggering the clear action from each field in turn. After each clear
+        action, verifies that all fields are empty, regardless of which field initiated the clear.
+        """
+        for field in self.fields:
+            self.click_on("form-field", labels=[field])
+            autofill_popup_obj.click_autofill_form_option()
+            self.click_on("form-field", labels=[field])
+            autofill_popup_obj.click_clear_form_option()
+            # Verify that all fields are blank
+            for f in self.fields:
+                self.element_attribute_contains("form-field", "value", "", labels=[f])
+            # Verify that the 'cc-csc' field does not trigger an autofill dropdown
+            self.double_click("form-field", labels=["cc-csc"])
+            autofill_popup_obj.ensure_autofill_dropdown_not_visible()
+
 
 class LoginAutofill(Autofill):
     """

modules/util.py

@@ -403,21 +403,70 @@ def get_state_province_abbreviation(self, full_name: str) -> str:
         """
         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",
-
+            "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",
+            "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")