vs/CC-doorhanger-data-is-saved-in-about-prefs

Author: vsangereanMOZ

l10n_CM/Unified/test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py

@@ -35,24 +35,24 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(driver: Firefox, region:
     # The "Save credit card?" doorhanger is displayed
     assert autofill_popup_obj.element_visible("doorhanger-save-button"), "Credit card save doorhanger is not visible"
 
+    # Verify Credit Card Doorhanger Data
+    doorhanger_text = autofill_popup_obj.get_cc_doorhanger_data("cc-doorhanger-data")
+    assert credit_card_sample_data.card_number[-4:] in doorhanger_text, f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but not found."
+    assert credit_card_sample_data.name in doorhanger_text, f"Expected name '{credit_card_sample_data.name}' but not found."
+    assert credit_card_sample_data.cvv not in doorhanger_text, f"cvv '{credit_card_sample_data.cvv}' should not be saved, but found in doorhanger."
+
     # Click the "Save" button using click_doorhanger_button
     autofill_popup_obj.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
     about_prefs = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_save_credit_cards_popup_iframe()
+    iframe = about_prefs.get_saved_payments_popup_iframe()
     browser_action_obj.switch_to_iframe_context(iframe)
 
-    # get the text from the row and split by the comma, striping any leading or trailing whitespace on the way.
+    # Get stored values
     elements = [x.strip() for x in about_prefs.get_element("saved-credit-cards-values").text.split(',')]
 
     # Validate stored values match expected values
-    assert elements[0].endswith(credit_card_sample_data.card_number[-4:]), \
-        f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but got '{elements[0]}'"
-
-    assert elements[1] == credit_card_sample_data.name, \
-        f"Expected name '{credit_card_sample_data.name}' but got '{elements[1]}'"
-
-    expected_expiry = f"Expires on {int(credit_card_sample_data.expiration_month)}/20{credit_card_sample_data.expiration_year}"
-    assert elements[2] == expected_expiry, \
-        f"Expected expiration '{expected_expiry}' but got '{elements[2]}'"
+    assert elements[0].endswith(credit_card_sample_data.card_number[-4:]), f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but got '{elements[0]}'"
+    assert elements[1] == credit_card_sample_data.name, f"Expected name '{credit_card_sample_data.name}' but got '{elements[1]}'"
+    assert credit_card_sample_data.cvv not in elements, f"cvv '{credit_card_sample_data.cvv}' should not be saved, but found in stored values."

modules/browser_object_autofill_popup.py

@@ -53,6 +53,17 @@ def click_clear_form_option(self) -> BasePage:
             self.get_element("clear-form-option").click()
         return self
 
+    def get_doorhanger_cc_number(self) -> str:
+        """Retrieves the last 4 digits of the credit card from the doorhanger popup"""
+        return self.get_element("doorhanger-cc-number").text
+
+    def get_cc_doorhanger_data(self, selector: str) -> str:
+        """
+            get text for the credit card doorhanger data.
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            return self.get_element(selector).text
+
     # Interaction with autocomplete list elements
     def get_nth_element(self, index: str) -> WebElement:
         """

modules/page_object_prefs.py

@@ -265,14 +265,6 @@ def get_save_addresses_popup_iframe(self) -> WebElement:
         iframe = self.get_element("browser-popup")
         return iframe
 
-    def get_save_credit_cards_popup_iframe(self) -> WebElement:
-        """
-        Returns the iframe object for the credit card dialog panel in the popup
-        """
-        self.get_element("prefs-button", labels=["Saved payment methods"]).click()
-        iframe = self.get_element("browser-popup")
-        return iframe
-
     def get_password_exceptions_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the Password Exceptions dialog panel in the popup.