Merge pull request #475 from mozilla/vs/CC-doorhanger-data-is-saved

Vs/cc doorhanger data is saved

Author: Tracy-Walker

SELECTOR_INFO.md

@@ -571,6 +571,20 @@ Location: about:preferences#privacy Saved Addresses popup dialog
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: saved-credit-cards
+Selector Data: "credit-cards"
+Description: The element that contains the saved credit cards
+Location: about:preferences#privacy Saved Credit Cards popup dialog
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: saved-credit-cards-values
+Selector Data: "#credit-cards option"
+Description: The element that contains the saved credit cards values
+Location: about:preferences#privacy Saved Credit Cards popup dialog
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: panel-popup-stack
 Selector Data: "dialogStack"
 Description: The element that contains the credit card profile values

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -23,19 +23,20 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     """
     C2888703 - Verify Address data are captured in the Capture Doorhanger and stored in about:preferences
     """
-    # create fake data and fill it in
+    # 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
     autofill_popup.element_visible("address-save-doorhanger")
 
-    # containing Street Address field
+    # Containing Street Address field
     expected_street_add = address_autofill_data.street_address
+
     autofill_popup.element_has_text("address-doorhanger-street", expected_street_add)
 
-    # containing City field
+    # Containing City field
     expected_city = address_autofill_data.address_level_2
     autofill_popup.element_has_text("address-doorhanger-city", expected_city)
 
@@ -51,10 +52,12 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
         if region in ["FR", "DE"]
         else "address-doorhanger-zip"
     )
+
     autofill_popup.element_has_text(zip_selector, expected_zip)
 
-    # containing Country field
+    # Containing Country field
     expected_country = address_autofill_data.country
+
     autofill_popup.element_has_text("address-doorhanger-country", expected_country)
 
     # Click the "Save" button

l10n_CM/Unified/test_demo_addy_verify_new_address_added.py renamed to l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -0,0 +1,75 @@
+import time
+
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import CreditCardFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2886597"
+
+
+def test_demo_cc_data_captured_in_doorhanger_and_stored(driver: Firefox, region: str):
+    """
+    C2889999 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
+    """
+
+    # Instantiate objects
+    credit_card_fill_obj = CreditCardFill(driver)
+    autofill_popup_obj = AutofillPopup(driver)
+    util = Utilities()
+    browser_action_obj = BrowserActions(driver)
+
+    # Navigate to page
+    credit_card_fill_obj.open()
+
+    # Fill data
+    credit_card_sample_data = util.fake_credit_card_data()
+    credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
+
+    # 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_saved_payments_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+
+    # 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]}'"
+    )
+    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."
+    )

l10n_CM/Unified/test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py

@@ -1,15 +1,17 @@
 {
   "tests": [
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_add_new_credit_card.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_address_data_captured_in_doorhanger_and_stored.py",
-        "test_demo_cc_dropdown-presence.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_ad_autofill_name_org.py",
-        "test_demo_cc_yellow_highlight.py",
-        "test_demo_ad_autofill_phone_email.py"
+        "test_demo_cc_yellow_highlight.py"
   ]
 }

l10n_CM/region/Unified.json

@@ -52,6 +52,17 @@ def click_clear_form_option(self) -> BasePage:
         self.click_on("clear-form-option")
         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/browser_object_autofill_popup.py

@@ -1,7 +1,7 @@
 import logging
 
 from selenium.common.exceptions import TimeoutException
-from selenium.webdriver.common.action_chains import ActionChains
+from selenium.webdriver import ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.webelement import WebElement

modules/browser_object_navigation.py

@@ -135,6 +135,18 @@
         "groups": []
     },
 
+    "saved-credit-cards": {
+        "selectorData": "credit-cards",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "saved-credit-cards-values": {
+        "selectorData": "#credit-cards option",
+        "strategy": "css",
+        "groups": []
+    },
+
     "panel-popup-stack": {
         "selectorData": "dialogStack",
         "strategy": "id",

modules/data/about_prefs.components.json

@@ -85,6 +85,12 @@
         "groups": []
     },
 
+     "cc-doorhanger-data": {
+        "selectorData": "popupnotificationcontent[class='credit-card-save-update-notification-content'] description",
+        "strategy": "css",
+        "groups": []
+    },
+
     "address-doorhanger-email": {
         "selectorData": "div.address-save-update-row-container:nth-of-type(2) div p:first-of-type span",
         "strategy": "css",

modules/data/autofill_popup.components.json

@@ -691,6 +691,14 @@ def switch_to_new_window(self) -> Page:
         with self.driver.context(self.driver.CONTEXT_CONTENT):
             return self.switch_to_new_tab()
 
+    def switch_to_new_private_window(self) -> Page:
+        "Switch to new private window"
+        non_private_window = self.driver.current_window_handle
+        original_window_idx = self.driver.window_handles.index(non_private_window)
+        private_window = self.driver.window_handles[1 - original_window_idx]
+        self.driver.switch_to.window(private_window)
+        return self
+
     def switch_to_frame(self, frame: str, labels=[]) -> Page:
         """Switch to inline document frame"""
         with self.driver.context(self.driver.CONTEXT_CHROME):