refactors: basic test cleanup, docstring, used conftest instansiatation

Author: philimon-reset

l10n_CM/Unified/test_demo_cc_add_new_credit_card.py

@@ -25,7 +25,7 @@ def test_create_new_cc_profile(
 
     # Go to about:preferences#privacy and open Saved Payment Methods
     about_prefs_privacy.open()
-    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
 
     # Save CC information using fake data
     credit_card_sample_data = util.fake_credit_card_data(region)

l10n_CM/Unified/test_demo_cc_clear_form.py

@@ -27,7 +27,7 @@ def test_cc_clear_form(
 
     # Save a credit card in about:preferences
     about_prefs_privacy.open()
-    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
 
     credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])

l10n_CM/Unified/test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py

@@ -52,7 +52,7 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
 
     # Navigate to about:preferences#privacy => "Autofill" section
     about_prefs_privacy.open()
-    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
 
     # Get stored values
     elements = [

l10n_CM/Unified/test_demo_cc_dropdown_presence.py

@@ -26,7 +26,7 @@ def test_dropdown_presence_credit_card(
 
     # Save a credit card in about:preferences
     about_prefs_privacy.open()
-    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
 
     credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])

l10n_CM/Unified/test_demo_cc_yellow_highlight.py

@@ -26,7 +26,7 @@ def test_cc_yellow_highlight(
 
     # Save a credit card in about:preferences
     about_prefs_privacy.open()
-    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
     credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
     about_prefs.fill_cc_panel_information(credit_card_sample_data)

modules/page_object_autofill.py

@@ -273,10 +273,10 @@ def update_credit_card_information(
         self.update_field(field_name, field_data, autofill_popup_obj)
         self.click_form_button("submit")
 
-        if not save_card:
-            autofill_popup_obj.click_on("update-card-info-popup-button")
-        else:
+        if save_card or field_name == "cc-number":
             autofill_popup_obj.click_on("doorhanger-save-button")
+        else:
+            autofill_popup_obj.click_on("update-card-info-popup-button")
 
     @BasePage.context_chrome
     def verify_autofill_cc_data_on_hover(

modules/page_object_prefs.py

@@ -268,16 +268,15 @@ def get_saved_payments_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup
         """
-        self.open_saved_payments_list()
+        self.get_saved_payments_popup().click()
         iframe = self.get_element("browser-popup")
         return iframe
 
-    def open_saved_payments_list(self):
+    def get_saved_payments_popup(self) -> WebElement:
         """
         Open saved payments dialog panel
         """
-        self.get_element("prefs-button", labels=["Saved payment methods"]).click()
-        return self
+        return self.get_element("prefs-button", labels=["Saved payment methods"])
 
     def click_edit_saved_payment(self):
         """
@@ -290,12 +289,12 @@ def click_edit_saved_payment(self):
         edit_button.click()
         return self
 
-    def switch_to_saved_payments_popup_iframe(self) -> BasePage:
+    def open_and_switch_to_saved_payments_popup(self) -> BasePage:
         """
-        Switch to saved payments popup frame.
+        Open and Switch to saved payments popup frame.
         """
-        saved_payments = self.get_saved_payments_popup_iframe()
-        self.driver.switch_to.frame(saved_payments)
+        saved_payments_iframe = self.get_saved_payments_popup_iframe()
+        self.driver.switch_to.frame(saved_payments_iframe)
         return self
 
     def switch_to_edit_saved_payments_popup_iframe(self) -> BasePage:
@@ -341,6 +340,14 @@ def get_saved_addresses_popup(self) -> WebElement:
         """
         return self.get_element("prefs-button", labels=["Saved addresses"])
 
+    def open_and_switch_to_saved_addresses_popup(self) -> BasePage:
+        """
+        Open and Switch to saved addresses popup frame.
+        """
+        saved_address_iframe = self.get_saved_addresses_popup_iframe()
+        self.driver.switch_to.frame(saved_address_iframe)
+        return self
+
     def switch_to_saved_addresses_popup_iframe(self) -> BasePage:
         """
         switch to save addresses popup frame.
@@ -349,6 +356,14 @@ def switch_to_saved_addresses_popup_iframe(self) -> BasePage:
         self.switch_to_iframe(1)
         return self
 
+    def switch_to_saved_payments_popup_iframe(self) -> BasePage:
+        """
+        switch to save payments popup frame.
+        """
+        self.switch_to_default_frame()
+        self.switch_to_iframe(1)
+        return self
+
     def switch_to_edit_saved_addresses_popup_iframe(self) -> BasePage:
         """
         Switch to form iframe to edit saved addresses.

tests/form_autofill/conftest.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 
 from modules.browser_object_autofill_popup import AutofillPopup
@@ -22,6 +24,11 @@ def prefs_list(add_to_prefs_list: dict):
     return prefs
 
 
+@pytest.fixture()
+def region():
+    return os.environ.get("FX_REGION", "US")
+
+
 @pytest.fixture()
 def add_to_prefs_list():
     return []

tests/form_autofill/test_address_autofill_attribute.py

@@ -5,8 +5,6 @@
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
 
-COUNTRY_CODE = "US"
-
 
 @pytest.fixture()
 def test_case():
@@ -18,6 +16,7 @@ def test_address_attribute_selection(
     address_autofill: AddressFill,
     autofill_popup: AutofillPopup,
     util: Utilities,
+    region: str,
 ):
     """
     C122359 - This test verifies that after filling the autofill fields and saving the data, hovering over the first
@@ -27,12 +26,13 @@ def test_address_attribute_selection(
         address_autofill: AddressFill instance
         autofill_popup: AutofillPopup instance
         util: Utilities instance
+        region: country code in use
     """
     # 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)
+    autofill_sample_data = util.fake_autofill_data(region)
     address_autofill.save_information_basic(autofill_sample_data)
     autofill_popup.click_doorhanger_button("save")
 

tests/form_autofill/test_autofill_cc_cvv.py

@@ -1,13 +1,12 @@
 import json
-import logging
 
 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
+from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -26,7 +25,7 @@ def test_autofill_cc_cvv(
     C122399, Test form autofill CC CVV number
 
     Arguments:
-        about_prefs_privacy: AboutPrefs instance
+        about_prefs_privacy: AboutPrefs instance (privacy category)
         credit_card_autofill: CreditCardFill instance
         autofill_popup: AutofillPopup instance
         util: Utilities instance
@@ -43,7 +42,7 @@ def test_autofill_cc_cvv(
 
     # navigate to prefs
     about_prefs_privacy.open()
-    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
 
     # Get the saved CC data (first entry)
     cc_profile = about_prefs_privacy.get_all_saved_cc_profiles()[0]