Merge branch 'main' into philimon/dynamic_addressfill

Author: philimon-reset

conftest.py

@@ -394,7 +394,7 @@ def driver(
     fx_executable: str,
     opt_headless: bool,
     opt_implicit_timeout: int,
-    set_prefs: List[Tuple],
+    prefs_list: List[Tuple],
     opt_ci: bool,
     opt_window_size: str,
     use_profile: Union[bool, str],
@@ -426,7 +426,7 @@ def driver(
     opt_implicit_timeout: int
         Timeout, in seconds for driver-level wait attribute.
 
-    set_prefs: List[Tuple]
+    prefs_list: List[Tuple]
         Preferences to set before the Firefox object is created.
         Usually set in the conftest.py inside a test suite folder.
 
@@ -454,7 +454,7 @@ def driver(
             profile_path = tmp_path / use_profile
             unpack_archive(os.path.join("profiles", f"{use_profile}.zip"), profile_path)
             options.profile = profile_path
-        for opt, value in set_prefs:
+        for opt, value in prefs_list:
             options.set_preference(opt, value)
         driver = Firefox(options=options)
         separator = "x"

l10n_CM/Unified/conftest.py

@@ -15,20 +15,20 @@ def region():
 
 
 @pytest.fixture()
-def add_prefs(region: str):
+def add_to_prefs_list(region: str):
     return []
 
 
 @pytest.fixture()
-def set_prefs(add_prefs: List[tuple[str, str | bool]], region: str):
-    """Set prefs"""
+def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
+    """List of prefs to send to main conftest.py driver fixture"""
     prefs = [
         ("extensions.formautofill.creditCards.reauth.optout", False),
         ("extensions.formautofill.reauth.enabled", False),
         ("browser.aboutConfig.showWarning", False),
         ("browser.search.region", region),
     ]
-    prefs.extend(add_prefs)
+    prefs.extend(add_to_prefs_list)
     return prefs
 
 

l10n_CM/Unified/test_demo_ad_autofill_dropdown_present_for_email_and_phone.py

@@ -0,0 +1,40 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888567"
+
+
+def test_dropdown_presence_email_phone_field(
+        driver: Firefox,
+        region: str,
+        address_autofill: AddressFill,
+        util: Utilities,
+        autofill_popup: AutofillPopup,
+):
+    """
+    C2888567 - Verify that the autofill dropdown is displayed for the email and phone fields
+    after the contact information was previously saved.
+    """
+
+    # Open autofill page
+    address_autofill.open()
+
+    # Generate and save fake data
+    address_autofill_data = util.fake_autofill_data(region)
+    address_autofill.save_information_basic(address_autofill_data)
+
+    # Click the "Save" button
+    autofill_popup.click_doorhanger_button("save")
+
+    fields_to_test = ["email", "tel"]
+
+    address_autofill.verify_autofill_dropdown_addresses(
+        autofill_popup=autofill_popup, fields_to_test=fields_to_test, region=region
+    )

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -30,12 +30,10 @@ def test_demo_ad_autofill_name_org(
     autofill_popup.click_doorhanger_button("save")
 
     # List of field labels to be autofilled and verified
-    fields_to_test = [
-        "name",
-        "organization"
-    ]
+    fields_to_test = ["name", "organization"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.autofill_and_verify(autofill_popup, field,
-                                             address_autofill_data, util)
+        address_autofill.autofill_and_verify(
+            autofill_popup, field, address_autofill_data, util
+        )

l10n_CM/Unified/test_demo_ad_autofill_phone_email.py

@@ -31,12 +31,10 @@ def test_demo_ad_autofill_phone_email(
     autofill_popup.click_doorhanger_button("save")
 
     # List of field labels to be autofilled and verified
-    fields_to_test = [
-        "email",
-        "tel"
-    ]
+    fields_to_test = ["email", "tel"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.autofill_and_verify(autofill_popup, field,
-                                             address_autofill_data, util)
+        address_autofill.autofill_and_verify(
+            autofill_popup, field, address_autofill_data, util
+        )

l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -13,7 +13,7 @@ def test_case():
 
 
 @pytest.fixture()
-def add_prefs(region: str):
+def add_to_prefs_list(region: str):
     return [
         ("extensions.formautofill.creditCards.supportedCountries", region),
         ("extensions.formautofill.addresses.supported", "on"),

l10n_CM/Unified/test_demo_cc_autofill_from_dropdown.py

@@ -6,7 +6,6 @@
 from modules.util import Utilities
 
 
-
 @pytest.fixture()
 def test_case():
     return "2886600"
@@ -17,7 +16,6 @@ def test_cc_autofill_from_dropdown(
     util: Utilities,
     autofill_popup: AutofillPopup,
     credit_card_fill_obj: CreditCardFill,
-
 ):
     """
     Verify that saved credit card information is autofilled correctly when selected from the dropdown,
@@ -37,4 +35,4 @@ def test_cc_autofill_from_dropdown(
 
     # Step 5: Click the csc field (cc-csc), ensure autofill popup is not present
     credit_card_fill_obj.click_on("form-field", labels=["cc-csc"])  # Use single click
-    autofill_popup.ensure_autofill_dropdown_not_visible()
+    autofill_popup.ensure_autofill_dropdown_not_visible()

l10n_CM/conftest.py

@@ -7,6 +7,13 @@ def suite_id():
 
 
 @pytest.fixture()
-def set_prefs():
-    """Set prefs"""
+def prefs_list(add_to_prefs_list: dict):
+    """List of prefs to send to main conftest.py driver fixture"""
+    prefs = []
+    prefs.extend(add_to_prefs_list)
+    return prefs
+
+
+@pytest.fixture()
+def add_to_prefs_list():
     return []

l10n_CM/region/US.json

@@ -1,4 +1,4 @@
 {
     "region": "US",
-    "tests": []
+    "tests": ["test_demo_ad_autofill_dropdown_present_for_email_and_phone.py"]
 }

modules/browser_object_tabbar.py

@@ -83,7 +83,7 @@ def click_tab_by_title(self, title: str) -> BasePage:
             self.get_element("tab-by-title", labels=[title]).click()
         return self
 
-    def get_tab_by_title(self, title: str) -> BasePage:
+    def get_tab_by_title(self, title: str) -> WebElement:
         """Given a full page title, return the corresponding tab"""
         with self.driver.context(self.driver.CONTEXT_CHROME):
             return self.get_element("tab-by-title", labels=[title])