form autofill initial refactor

Author: philimon-reset

modules/browser_object_autofill_popup.py

@@ -41,10 +41,10 @@ def click_doorhanger_button(self, button_type: str) -> BasePage:
         return self
 
     # Interaction with form options
+    @BasePage.context_chrome
     def click_autofill_form_option(self) -> BasePage:
         """Clicks the credit card or address selection in the autofill panel"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("select-form-option").click()
+        self.get_element("select-form-option").click()
         return self
 
     def click_clear_form_option(self) -> BasePage:
@@ -56,49 +56,49 @@ 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
 
+    @BasePage.context_chrome
     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
+        return self.get_element(selector).text
 
     # Interaction with autocomplete list elements
+    @BasePage.context_chrome
     def get_nth_element(self, index: str | int) -> WebElement:
         """
         Get the nth element from the autocomplete list
         Parameters: index (str): The index of the element to retrieve (1-based)
         Returns: WebElement: The nth element in the autocomplete list
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            return self.wait.until(
-                EC.visibility_of_element_located(
-                    (
-                        "css selector",
-                        f".autocomplete-richlistbox .autocomplete-richlistitem:nth-child({index})",
-                    )
+        return self.wait.until(
+            EC.visibility_of_element_located(
+                (
+                    "css selector",
+                    f".autocomplete-richlistbox .autocomplete-richlistitem:nth-child({index})",
                 )
             )
+        )
 
+    @BasePage.context_chrome
     def select_nth_element(self, index: int):
         """
         Select the nth element from the autocomplete list
         Arguments:
             index (int): The index of the element to retrieve (1-based)
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.expect(
-                EC.visibility_of(
-                    self.get_element("select-form-option-by-index", labels=[str(index)])
-                )
+        self.expect(
+            EC.visibility_of(
+                self.get_element("select-form-option-by-index", labels=[str(index)])
             )
-            self.get_element("select-form-option-by-index", labels=[str(index)]).click()
+        )
+        self.get_element("select-form-option-by-index", labels=[str(index)]).click()
 
+    @BasePage.context_chrome
     def get_primary_value(self, element: WebElement) -> str:
         """
         Get the primary value from the autocomplete element
         Parameters: element (WebElement): The autocomplete element from which to retrieve the primary value
         Returns: str: The primary value extracted from the element's attribute
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            return element.get_attribute("ac-value")
+        return element.get_attribute("ac-value")

modules/page_object_autofill.py

@@ -525,13 +525,13 @@ def save_information_basic(self, autofill_info: AutofillAddressBase):
 
         self.click_form_button("submit")
 
+    @BasePage.context_chrome
     def verify_autofill_displayed(self):
         """
         Verifies that the autofill suggestions are displayed.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            element = self.get_element("select-address")
-            self.expect(EC.visibility_of(element))
+        element = self.get_element("select-address")
+        self.expect(EC.visibility_of(element))
 
     def check_autofill_preview_for_field(
         self,

modules/page_object_prefs.py

@@ -73,13 +73,48 @@ def verify_cc_json(
         cc_info_json: dict
             The dictionary that is the json representation of the extracted information from a web page
         credit_card_fill_obj: CreditCardBase
-            The object that contains all of the generated information
+            The object that contains all the generated information
         """
         assert cc_info_json["name"] == credit_card_fill_obj.name
         assert cc_info_json["number"][-4:] == credit_card_fill_obj.card_number[-4:]
         assert int(cc_info_json["month"]) == int(credit_card_fill_obj.expiration_month)
         return self
 
+    def verify_cc_edit_saved_payments_profile(
+        self, credit_card_fill_obj: CreditCardBase
+    ):
+        """
+        Verify saved payment profile data is the same as the generated fake credit_card_fill_obj data.
+        Make sure cvv is not displayed.
+
+        Arguments:
+            credit_card_fill_obj: CreditCardBase
+                The object that contains all the generated information
+        """
+        self.switch_to_edit_saved_payments_popup_iframe()
+        form_container = self.get_element("form-container")
+        input_elements = form_container.find_elements(By.TAG_NAME, "input")
+        for element in input_elements:
+            field_name = element.get_attribute("id")
+            if field_name.startswith("cc"):
+                field_value = element.get_attribute("value")
+                assert field_value in credit_card_fill_obj.__dict__.values(), (
+                    f"{field_name} not found in generated data."
+                )
+                assert field_value != credit_card_fill_obj.cvv, "CVV is displayed."
+        select_elements = form_container.find_elements(By.TAG_NAME, "select")
+        for element in select_elements:
+            field_name = element.get_attribute("id")
+            if field_name.startswith("cc"):
+                val = Select(element)
+                # Only get the last two digits
+                field_value = val.first_selected_option.get_attribute("value")[-2:]
+                assert field_value in credit_card_fill_obj.__dict__.values(), (
+                    f"{field_name} not found in generated data."
+                )
+                assert field_value != credit_card_fill_obj.cvv, "CVV is displayed."
+        return self
+
     def press_button_get_popup_dialog_iframe(self, button_label: str) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup after pressing some button that triggers a popup
@@ -233,10 +268,28 @@ def get_saved_payments_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup
         """
-        self.get_element("prefs-button", labels=["Saved payment methods"]).click()
+        self.open_saved_payments_list()
         iframe = self.get_element("browser-popup")
         return iframe
 
+    def open_saved_payments_list(self):
+        """
+        Open saved payments dialog panel
+        """
+        self.get_element("prefs-button", labels=["Saved payment methods"]).click()
+        return self
+
+    def click_edit_saved_payment(self):
+        """
+        Click on edit button on saved payments dialog panel
+        """
+        edit_button = self.get_element(
+            "panel-popup-button", labels=["autofill-manage-edit-button"]
+        )
+        self.expect(EC.element_to_be_clickable(edit_button))
+        edit_button.click()
+        return self
+
     def switch_to_saved_payments_popup_iframe(self) -> BasePage:
         """
         Switch to saved payments popup frame.
@@ -245,6 +298,14 @@ def switch_to_saved_payments_popup_iframe(self) -> BasePage:
         self.driver.switch_to.frame(saved_payments)
         return self
 
+    def switch_to_edit_saved_payments_popup_iframe(self) -> BasePage:
+        """
+        Switch to form iframe to edit saved payments.
+        """
+        self.switch_to_default_frame()
+        self.switch_to_iframe(2)
+        return self
+
     def update_cc_field_panel(self, num_tabs: int, new_info: str) -> BasePage:
         """
         Updates a field in the credit card popup panel in about:prefs by pressing the number of tabs and sending the new information

tests/form_autofill/conftest.py

@@ -1,5 +1,10 @@
 import pytest
 
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill, CreditCardFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import Utilities
+
 
 @pytest.fixture()
 def suite_id():
@@ -20,3 +25,33 @@ def prefs_list(add_to_prefs_list: dict):
 @pytest.fixture()
 def add_to_prefs_list():
     return []
+
+
+@pytest.fixture()
+def address_autofill(driver):
+    yield AddressFill(driver)
+
+
+@pytest.fixture()
+def autofill_popup(driver):
+    yield AutofillPopup(driver)
+
+
+@pytest.fixture()
+def util():
+    yield Utilities()
+
+
+@pytest.fixture()
+def about_prefs_privacy(driver):
+    yield AboutPrefs(driver, category="privacy")
+
+
+@pytest.fixture()
+def about_prefs(driver):
+    yield AboutPrefs(driver)
+
+
+@pytest.fixture()
+def credit_card_autofill(driver):
+    yield CreditCardFill(driver)

tests/form_autofill/test_address_autofill_attribute.py

@@ -13,28 +13,35 @@ def test_case():
     return "122359"
 
 
-def test_address_attribute_selection(driver: Firefox):
+def test_address_attribute_selection(
+    driver: Firefox,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+):
     """
     C122359 - This test verifies that after filling the autofill fields and saving the data, hovering over the first
     item in the dropdown ensures that the actual value matches the expected value.
+
+    Arguments:
+        address_autofill: AddressFill instance
+        autofill_popup: AutofillPopup instance
+        util: Utilities instance
     """
-    # Instantiate objects and open the navigation page
-    address_form_fields = AddressFill(driver).open()
-    autofill_popup_panel = AutofillPopup(driver)
-    util = Utilities()
+    # open the navigation page
+    address_autofill.open()
 
     # Create fake data, fill in the form, and press submit and save on the doorhanger
     autofill_sample_data = util.fake_autofill_data(COUNTRY_CODE)
-    address_form_fields.save_information_basic(autofill_sample_data)
-    autofill_popup_panel.click_doorhanger_button("save")
+    address_autofill.save_information_basic(autofill_sample_data)
+    autofill_popup.click_doorhanger_button("save")
 
     # Double-click on the name field to trigger the autocomplete dropdown
-    address_form_fields.click_on("form-field", labels=["street-address"])
-    address_form_fields.click_on("form-field", labels=["street-address"])
+    address_autofill.double_click("form-field", labels=["street-address"])
 
     # Get the first element from the autocomplete dropdown
-    first_item = autofill_popup_panel.get_nth_element(1)
-    actual_value = autofill_popup_panel.hover(first_item).get_primary_value(first_item)
+    first_item = autofill_popup.get_nth_element(1)
+    actual_value = autofill_popup.hover(first_item).get_primary_value(first_item)
 
     # Get the primary value (street address) from the first item in the dropdown and assert that the actual value
     # matches the expected value

tests/form_autofill/test_autofill_cc_cvv.py

@@ -15,44 +15,46 @@ def test_case():
     return "122399"
 
 
-def test_autofill_cc_cvv(driver: Firefox):
+def test_autofill_cc_cvv(
+    driver: Firefox,
+    credit_card_autofill: CreditCardFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+    about_prefs_privacy: AboutPrefs,
+):
     """
     C122399, Test form autofill CC CVV number
+
+    Arguments:
+        about_prefs_privacy: AboutPrefs instance
+        credit_card_autofill: CreditCardFill instance
+        autofill_popup: AutofillPopup instance
+        util: Utilities instance
     """
-    # instantiate objects
-    credit_card_autofill = CreditCardFill(driver).open()
-    autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-    about_prefs_obj = AboutPrefs(driver, category="privacy")
-    browser_action_obj = BrowserActions(driver)
-
-    # create fake data, fill it in and press submit and save on the doorhanger
+
+    # open credit card autofill page
+    credit_card_autofill.open()
+
+    # create fake data, fill it in and press submit and save on the door hanger
     credit_card_sample_data = util.fake_credit_card_data()
     credit_card_autofill.fill_credit_card_info(credit_card_sample_data)
     cvv = credit_card_sample_data.cvv
     autofill_popup.click_doorhanger_button("save")
 
     # navigate to prefs
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+
+    # Get the saved CC data (first entry)
+    cc_profile = about_prefs_privacy.get_all_saved_cc_profiles()[0]
+    cc_info_json = json.loads(cc_profile.get_dom_attribute("data-l10n-args"))
+
+    # Compare input CC data with saved CC data
+    about_prefs_privacy.verify_cc_json(cc_info_json, credit_card_sample_data)
+
+    # Click on saved address and edit
+    cc_profile.click()
+    about_prefs_privacy.click_edit_saved_payment()
 
-    about_prefs_obj.open()
-    iframe = about_prefs_obj.press_button_get_popup_dialog_iframe(
-        "Saved payment methods"
-    )
-    browser_action_obj.switch_to_iframe_context(iframe)
-
-    # Select the saved cc
-    saved_profile = about_prefs_obj.get_element("cc-saved-options")
-    info_string = saved_profile.get_attribute("data-l10n-args")
-    cc_info_json_original = json.loads(info_string)
-    logging.info(f"Extracted Original data: {cc_info_json_original}")
-    saved_profile.click()
-
-    # Click on edit
-    about_prefs_obj.get_element(
-        "panel-popup-button", labels=["autofill-manage-edit-button"]
-    ).click()
-
-    # Verify that CVV number is not saved under CC profile
-    element = about_prefs_obj.get_element("cc-saved-options", multiple=True)
-    cvv_not_displayed = not any(cvv in element.text for element in element)
-    assert cvv_not_displayed, "CVV is displayed."
+    # Verify that CVV number is not saved under CC profile but the rest of the data is saved
+    about_prefs_privacy.verify_cc_edit_saved_payments_profile(credit_card_sample_data)