Add back accidentally removed selectors

Author: Tracy-Walker

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -12,11 +12,9 @@ def test_case():
     return "2888703"
 
 
-
 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
     """
@@ -59,7 +57,7 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
         if region in ["FR", "DE"]
         else "address-doorhanger-zip"
     )
-    
+
     address_autofill_popup.element_has_text(zip_selector, expected_zip)
 
     # containing Country field
@@ -97,4 +95,3 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     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_doorhanger_data_is_stored_in_about_prefs.py

@@ -6,7 +6,7 @@
 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 Utilities, BrowserActions
+from modules.util import BrowserActions, Utilities
 
 
 @pytest.fixture()
@@ -33,13 +33,21 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(driver: Firefox, region:
     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"
+    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."
+    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")
@@ -50,9 +58,18 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(driver: Firefox, region:
     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(',')]
+    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."
+    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

@@ -58,7 +58,7 @@ def get_doorhanger_cc_number(self) -> str:
 
     def get_cc_doorhanger_data(self, selector: str) -> str:
         """
-            get text for the credit card doorhanger data.
+        get text for the credit card doorhanger data.
         """
         with self.driver.context(self.driver.CONTEXT_CHROME):
             return self.get_element(selector).text

modules/browser_object_navigation.py

@@ -382,3 +382,14 @@ def handle_geolocation_prompt(self, button_type="primary"):
         button_selector = f"popup-notification-{button_type}-button"
         self.element_clickable(button_selector)
         self.click_on(button_selector)
+
+    def open_searchmode_switcher_settings(self):
+        """Open search settings from searchmode switcher in awesome bar"""
+        self.click_on("searchmode-switcher")
+        self.click_on("searchmode-switcher-settings")
+        return self
+
+    def select_element_in_nav(self, element: str) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element(element).click()
+            return self

modules/page_object_autofill.py

@@ -414,7 +414,9 @@ def send_keys_to_element(self, name: str, label: str, keys: str):
         elem.clear()
         elem.send_keys(new_value)
 
-    def verify_autofill_data(self, autofill_data: AutofillAddressBase, region: str, util: Utilities):
+    def verify_autofill_data(
+        self, autofill_data: AutofillAddressBase, region: str, util: Utilities
+    ):
         """
         Verifies that the autofill data matches the expected values.
 
@@ -465,7 +467,9 @@ def verify_autofill_data(self, autofill_data: AutofillAddressBase, region: str,
             if field == "Phone":
                 actual = util.normalize_phone_number(actual)
 
-            assert actual == expected, f"Mismatch in {field}: Expected '{expected}', but got '{actual}'"
+            assert actual == expected, (
+                f"Mismatch in {field}: Expected '{expected}', but got '{actual}'"
+            )
 
 
 class TextAreaFormAutofill(Autofill):