minor change for email phone capture

philimon-reset · philimon-reset · commit 0d98f74b54c0 · 2025-02-19T14:48:20.000+01:00
diff --git a/l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py b/l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py
@@ -87,6 +87,4 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     found_address_data = any(
         all(value in element.text for value in expected_values) for element in elements
     )
-    assert found_address_data, (
-        "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"
-    )
+    assert found_address_data, "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"
diff --git a/l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py b/l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py
@@ -1,3 +1,5 @@
+from typing import Dict
+
 import pytest
 from selenium.webdriver import Firefox
 
@@ -13,16 +15,16 @@ def test_case():
 
 
 def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
+    about_prefs: AboutPrefs,
 ):
     """
     C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
     """
-    # instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-    browser_action_obj = BrowserActions(driver)
 
     # create fake data and fill it in
     address_autofill.open()
@@ -50,16 +52,23 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     address_autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_saved_addresses_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs.open()
+    about_prefs.switch_to_saved_addresses_popup_iframe()
 
     # The address saved in step 2 is listed in the "Saved addresses" modal: Email and phone
-    elements = about_prefs.get_elements("saved-addresses-values")
-    expected_values = [expected_phone, expected_email]
-    found_email_phone = any(
-        all(value in element.text for value in expected_values) for element in elements
-    )
-    assert found_email_phone, (
-        "Email or phone were not found in any of the address entries!"
+    elements = map(
+        data_sanitizer,
+        about_prefs.get_element("saved-addresses-values").text.split(","),
     )
+    expected_values = [expected_phone, expected_email]
+    found_email_phone = list(set(elements) & set(expected_values))
+    assert (
+        found_email_phone
+    ), "Email or phone were not found in any of the address entries!"
+
+
+def data_sanitizer(value: str):
+    value = value.strip()
+    if value[0] == "+":
+        return value[1:]
+    return value
diff --git a/l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py b/l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py
@@ -18,6 +18,7 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     address_autofill: AddressFill,
     util: Utilities,
     address_autofill_popup: AutofillPopup,
+    about_prefs: AboutPrefs,
 ):
     """
     C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
@@ -42,7 +43,7 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     address_autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs = AboutPrefs(driver, category="privacy").open()
+    about_prefs.open()
     about_prefs.switch_to_saved_addresses_popup_iframe()
 
     # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization
@@ -51,6 +52,6 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     found_name_org = any(
         all(value in element.text for value in expected_values) for element in elements
     )
-    assert found_name_org, (
-        "Name or organization were not found in any of the address entries!"
-    )
+    assert (
+        found_name_org
+    ), "Name or organization were not found in any of the address entries!"
diff --git a/l10n_CM/Unified/test_demo_cc_clear_form.py b/l10n_CM/Unified/test_demo_cc_clear_form.py
@@ -11,24 +11,23 @@ def test_case():
     return "2886602"
 
 
-def test_cc_clear_form(driver: Firefox):
+def test_cc_clear_form(
+    driver: Firefox,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
+    about_prefs: AboutPrefs,
+    about_prefs_cc_popup: AboutPrefs,
+    credit_card_fill_obj: CreditCardFill,
+):
     """
     C2886602 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
     field from which the clear action was triggered.
     """
 
-    # Initialize objects
-    util = Utilities()
-    about_prefs = AboutPrefs(driver, category="privacy")
-    about_prefs_cc_popup = AboutPrefs(driver)
-    browser_action_obj = BrowserActions(driver)
-    credit_card_fill_obj = CreditCardFill(driver)
-    autofill_popup = AutofillPopup(driver)
-
     # Save a credit card in about:preferences
     about_prefs.open()
-    iframe = about_prefs.get_saved_payments_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs.switch_to_saved_payments_popup_iframe()
+
     credit_card_sample_data = util.fake_credit_card_data()
     about_prefs_cc_popup.click_on(
         "panel-popup-button", labels=["autofill-manage-add-button"]
@@ -37,4 +36,4 @@ def test_cc_clear_form(driver: Firefox):
 
     # Open credit card form page, clear form and verify all fields are empty
     credit_card_fill_obj.open()
-    credit_card_fill_obj.verify_clear_form_all_fields(autofill_popup)
+    credit_card_fill_obj.verify_clear_form_all_fields(address_autofill_popup)
diff --git a/modules/browser_object_tracker_panel.py b/modules/browser_object_tracker_panel.py
@@ -145,9 +145,7 @@ def verify_tracker_shield_indicator(self, nav: Navigation) -> BasePage:
             assert (
                 shield_icon.get_attribute("data-l10n-id")
                 == "tracking-protection-icon-active-container"
-            ), (
-                "The label detected did not correspond to the expected one: tracking-protection-icon-active-container"
-            )
+            ), "The label detected did not correspond to the expected one: tracking-protection-icon-active-container"
         return self
 
     def open_and_return_cross_site_trackers(self) -> List[WebElement]:
diff --git a/modules/page_base.py b/modules/page_base.py
@@ -437,9 +437,9 @@ def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         self.url_contains(url_substr)
         current_url = self.driver.current_url
 
-        assert re.match(pattern, current_url), (
-            f"URL does not match the expected pattern: {current_url}"
-        )
+        assert re.match(
+            pattern, current_url
+        ), f"URL does not match the expected pattern: {current_url}"
         return self
 
     def fill(
@@ -490,9 +490,9 @@ def fetch(self, reference: Union[str, tuple, WebElement], labels=[]) -> WebEleme
             return self.find_element(*reference)
         elif isinstance(reference, WebElement):
             return reference
-        assert False, (
-            "Bad fetch: only selectors, selector names, or WebElements allowed."
-        )
+        assert (
+            False
+        ), "Bad fetch: only selectors, selector names, or WebElements allowed."
 
     def click_on(self, reference: Union[str, tuple, WebElement], labels=[]) -> Page:
         """Click on an element, no matter the context, return the page"""
diff --git a/tests/address_bar_and_search/test_adaptive_history_autofill.py b/tests/address_bar_and_search/test_adaptive_history_autofill.py
@@ -61,11 +61,11 @@ def test_add_adaptive_history_autofill(driver: Firefox):
     )
 
     # Assertion to verify that the 'autofill_adaptive' type is found
-    assert autofill_adaptive_element.get_attribute("type") == "autofill_adaptive", (
-        f"Expected element type to be 'autofill_adaptive' but found '{autofill_adaptive_element.get_attribute('type')}'"
-    )
+    assert (
+        autofill_adaptive_element.get_attribute("type") == "autofill_adaptive"
+    ), f"Expected element type to be 'autofill_adaptive' but found '{autofill_adaptive_element.get_attribute('type')}'"
 
     # Assertion to check the autofilled URL is the expected one
-    assert "nationalgeographic.com/science" in autofill_adaptive_element.text, (
-        "URL 'https://www.nationalgeographic.com/science' not found in autofill suggestions."
-    )
+    assert (
+        "nationalgeographic.com/science" in autofill_adaptive_element.text
+    ), "URL 'https://www.nationalgeographic.com/science' not found in autofill suggestions."
diff --git a/tests/address_bar_and_search/test_preferences_all_toggles_enabled.py b/tests/address_bar_and_search/test_preferences_all_toggles_enabled.py
@@ -29,13 +29,13 @@ def test_preferences_all_toggles_enabled(driver: Firefox):
     if not show_suggestions_checkbox.is_selected():
         show_suggestions_checkbox.click()
     nonsponsored_checkbox = about_prefs.get_element("firefox-suggest-nonsponsored")
-    assert nonsponsored_checkbox.is_selected(), (
-        f"Checkbox with selector '{nonsponsored_checkbox}' is not checked"
-    )
+    assert (
+        nonsponsored_checkbox.is_selected()
+    ), f"Checkbox with selector '{nonsponsored_checkbox}' is not checked"
     sponsors_checkbox = about_prefs.get_element("firefox-suggest-sponsored")
-    assert sponsors_checkbox.is_selected(), (
-        f"Checkbox with selector '{sponsors_checkbox}' is not checked"
-    )
+    assert (
+        sponsors_checkbox.is_selected()
+    ), f"Checkbox with selector '{sponsors_checkbox}' is not checked"
 
     # Check if sponsored suggestion is displayed. Keep checking until the sponsered suggestions are displayed
     found = False
diff --git a/tests/address_bar_and_search/test_tile_menu_options.py b/tests/address_bar_and_search/test_tile_menu_options.py
@@ -138,6 +138,6 @@ def test_tile_context_menu_options(driver: Firefox, index: int, sponsored: bool)
             set_in_use.remove(match)
             logging.info(f"Detected the context item: {match}")
 
-    assert len(set_in_use) == 0, (
-        "Did not find all of the required context menu actions."
-    )
+    assert (
+        len(set_in_use) == 0
+    ), "Did not find all of the required context menu actions."
diff --git a/tests/bookmarks_and_history/test_opened_website_present_in_toolbar_history.py b/tests/bookmarks_and_history/test_opened_website_present_in_toolbar_history.py
@@ -32,6 +32,6 @@ def test_the_most_recent_website_is_present_in_history_menu(driver: Firefox):
     # Verify YouTube is present in the history menu and is on top of the list as the most recent website visited
     with driver.context(driver.CONTEXT_CHROME):
         recent_history_elements = panel_ui.get_elements("recent-history-content")
-        assert recent_history_elements[0].get_attribute("value") == "YouTube", (
-            "YouTube is not the first item in the recent history."
-        )
+        assert (
+            recent_history_elements[0].get_attribute("value") == "YouTube"
+        ), "YouTube is not the first item in the recent history."
diff --git a/tests/bookmarks_and_history/test_private_window_website_not_in_history.py b/tests/bookmarks_and_history/test_private_window_website_not_in_history.py
@@ -30,6 +30,6 @@ def test_opened_website_in_private_window_not_captured_in_history_list(driver: F
         empty_label = panel_ui.get_element("recent-history-content").get_attribute(
             "value"
         )
-        assert empty_label == "(Empty)", (
-            f"Expected history to be empty, but found '{empty_label}'"
-        )
+        assert (
+            empty_label == "(Empty)"
+        ), f"Expected history to be empty, but found '{empty_label}'"
diff --git a/tests/downloads/test_download_pdf.py b/tests/downloads/test_download_pdf.py
@@ -48,9 +48,9 @@ def test_download_pdf(
     saved_pdf_location = os.path.join(downloads_folder, file_name)
 
     # Verify if the file exists
-    assert os.path.exists(saved_pdf_location), (
-        f"The file was not downloaded to {saved_pdf_location}."
-    )
+    assert os.path.exists(
+        saved_pdf_location
+    ), f"The file was not downloaded to {saved_pdf_location}."
 
     print(
         f"Test passed: The file {file_name} has been downloaded and is present at {saved_pdf_location}."
diff --git a/tests/downloads/test_mixed_content_download_via_https.py b/tests/downloads/test_mixed_content_download_via_https.py
@@ -49,12 +49,12 @@ def test_mixed_content_download_via_https(driver: Firefox, delete_files):
 
         # Verify that the desired download target element is present directly, no extra steps needed.
         download_value = download_name.get_attribute("value")
-        assert re.match(r"download(\(\d+\))?$", download_value), (
-            f"The download name is incorrect: {download_value}"
-        )
+        assert re.match(
+            r"download(\(\d+\))?$", download_value
+        ), f"The download name is incorrect: {download_value}"
 
         # Verify that the download progress has reached 100%, which indicates that the download is complete.
         download_status_value = download_status.get_attribute("value")
-        assert download_status_value == "100", (
-            f"The download status is not '100': {download_status_value}"
-        )
+        assert (
+            download_status_value == "100"
+        ), f"The download status is not '100': {download_status_value}"
diff --git a/tests/form_autofill/test_address_autofill_attribute.py b/tests/form_autofill/test_address_autofill_attribute.py
@@ -39,6 +39,6 @@ def test_address_attribute_selection(driver: Firefox):
     # Get the primary value (street address) from the first item in the dropdown and assert that the actual value
     # matches the expected value
     expected_street_address = autofill_sample_data.street_address
-    assert expected_street_address == actual_value, (
-        f"Expected {expected_street_address}, but got {actual_value}"
-    )
+    assert (
+        expected_street_address == actual_value
+    ), f"Expected {expected_street_address}, but got {actual_value}"
diff --git a/tests/form_autofill/test_name_autofill_attribute.py b/tests/form_autofill/test_name_autofill_attribute.py
@@ -39,6 +39,6 @@ def test_name_attribute_selection(driver: Firefox):
     # Get the primary value (street address) from the first item in the dropdown and assert that the actual value
     # matches the expected value
     expected_name = autofill_sample_data.name
-    assert expected_name == actual_value, (
-        f"Expected {expected_name}, but got {actual_value}"
-    )
+    assert (
+        expected_name == actual_value
+    ), f"Expected {expected_name}, but got {actual_value}"
diff --git a/tests/form_autofill/test_updating_address.py b/tests/form_autofill/test_updating_address.py
@@ -48,17 +48,17 @@ def test_update_address(driver: Firefox):
 
     # Verify no dupe is saved
     element_list = about_prefs.get_elements("saved-addresses")
-    assert len(element_list) == 1, (
-        f"Expected 1 saved address, but found {len(element_list)}."
-    )
+    assert (
+        len(element_list) == 1
+    ), f"Expected 1 saved address, but found {len(element_list)}."
     print("Assertion passed: There is exactly 1 saved address.")
 
     # Assert that "Doe" is present in updated entry
     elements = about_prefs.get_elements("saved-addresses-values")
     found_updated_address = any("Doe" in element.text for element in elements)
-    assert found_updated_address, (
-        "The value 'Doe' was not found in any of the address entries."
-    )
+    assert (
+        found_updated_address
+    ), "The value 'Doe' was not found in any of the address entries."
 
     # Print the element that contains "Doe" for verification
     for element in elements:
diff --git a/tests/pdf_viewer/test_download_pdf_with_form_fields.py b/tests/pdf_viewer/test_download_pdf_with_form_fields.py
@@ -49,9 +49,9 @@ def test_download_pdf_with_form_fields(
     saved_pdf_location = os.path.join(downloads_folder, file_name)
 
     # Verify if the file exists
-    assert os.path.exists(saved_pdf_location), (
-        f"The file was not downloaded to {saved_pdf_location}."
-    )
+    assert os.path.exists(
+        saved_pdf_location
+    ), f"The file was not downloaded to {saved_pdf_location}."
 
     # Open the saved pdf and check if the edited field is displayed
     driver.get("file://" + os.path.realpath(saved_pdf_location))
diff --git a/tests/pdf_viewer/test_download_triggered_on_content_disposition_attachment.py b/tests/pdf_viewer/test_download_triggered_on_content_disposition_attachment.py
@@ -53,9 +53,9 @@ def test_download_panel_triggered_on_content_disposition_attachment(
         driver.find_element(By.ID, "unknownContentTypeWindow").send_keys(Keys.ENTER)
 
     tabs.wait_for_num_tabs(2)
-    assert len(driver.window_handles) == 2, (
-        f"Expected 2 tabs, but found {len(driver.window_handles)}"
-    )
+    assert (
+        len(driver.window_handles) == 2
+    ), f"Expected 2 tabs, but found {len(driver.window_handles)}"
 
     tabs.switch_to_new_tab()
     GenericPdf(driver, pdf_url="").url_contains("file:")
diff --git a/tests/pdf_viewer/test_pdf_data_can_be_cleared.py b/tests/pdf_viewer/test_pdf_data_can_be_cleared.py
@@ -71,7 +71,7 @@ def test_pdf_data_can_be_cleared(
     pdf.expect(lambda _: default_option.is_selected())
 
     # Assert that all fields are reset to their default state
-    assert pdf.get_element("first-name-field").get_attribute("value") == "", (
-        "Text field did not reset."
-    )
+    assert (
+        pdf.get_element("first-name-field").get_attribute("value") == ""
+    ), "Text field did not reset."
     assert not checkbox.is_selected(), "Checkbox did not reset."
diff --git a/tests/pdf_viewer/test_pdf_download.py b/tests/pdf_viewer/test_pdf_download.py
@@ -52,9 +52,9 @@ def test_pdf_download(
     pdf.expect(lambda _: os.path.exists(saved_pdf_location))
 
     # Verify if the file exists
-    assert os.path.exists(saved_pdf_location), (
-        f"The file was not downloaded to {saved_pdf_location}."
-    )
+    assert os.path.exists(
+        saved_pdf_location
+    ), f"The file was not downloaded to {saved_pdf_location}."
 
     print(
         f"Test passed: The file {file_name} has been downloaded and is present at {saved_pdf_location}."
diff --git a/tests/preferences/test_check_for_updates.py b/tests/preferences/test_check_for_updates.py
@@ -34,17 +34,17 @@ def test_check_for_updates(driver: Firefox):
     # Check the label of the buttons and assert they are correct
     if update_available_button.is_displayed():
         label = update_available_button.text
-        assert label == "Restart to Update Firefox", (
-            f"Expected label to be 'Restart to Update Firefox' but got '{label}'"
-        )
-        assert update_available_button.is_enabled(), (
-            "The 'Restart to Update Firefox' button is not clickable"
-        )
+        assert (
+            label == "Restart to Update Firefox"
+        ), f"Expected label to be 'Restart to Update Firefox' but got '{label}'"
+        assert (
+            update_available_button.is_enabled()
+        ), "The 'Restart to Update Firefox' button is not clickable"
     elif up_to_date_button.is_displayed():
         label = up_to_date_button.text
-        assert label == "Check for updates", (
-            f"Expected label to be 'Check for updates' but got '{label}'"
-        )
-        assert up_to_date_button.is_enabled(), (
-            "The 'Check for updates' button is not clickable"
-        )
+        assert (
+            label == "Check for updates"
+        ), f"Expected label to be 'Check for updates' but got '{label}'"
+        assert (
+            up_to_date_button.is_enabled()
+        ), "The 'Check for updates' button is not clickable"
diff --git a/tests/preferences/test_never_remember_history.py b/tests/preferences/test_never_remember_history.py
diff --git a/tests/scrolling_panning_zooming/test_mouse_wheel_zoom.py b/tests/scrolling_panning_zooming/test_mouse_wheel_zoom.py
diff --git a/tests/scrolling_panning_zooming/test_zoom_from_menu_bar.py b/tests/scrolling_panning_zooming/test_zoom_from_menu_bar.py
diff --git a/tests/scrolling_panning_zooming/test_zoom_menu_correlation.py b/tests/scrolling_panning_zooming/test_zoom_menu_correlation.py
diff --git a/tests/security_and_privacy/test_private_session_history_exclusion.py b/tests/security_and_privacy/test_private_session_history_exclusion.py
diff --git a/tests/security_and_privacy/test_tls_v1_2_protocol.py b/tests/security_and_privacy/test_tls_v1_2_protocol.py
diff --git a/tests/security_and_privacy/test_trackers_crypto_fingerprint_blocked.py b/tests/security_and_privacy/test_trackers_crypto_fingerprint_blocked.py
diff --git a/tests/tabs/test_list_all_tabs.py b/tests/tabs/test_list_all_tabs.py

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,4 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(`
`87`	`87`	`found_address_data = any(`
`88`	`88`	`all(value in element.text for value in expected_values) for element in elements`
`89`	`89`	`)`
`90`		`- assert found_address_data, (`
`91`		`- "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"`
`92`		`- )`
	`90`	`+ assert found_address_data, "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"`