merge main

Author: Hani Yacoub

.github/pull_request_template.md

@@ -1,28 +1,37 @@
-### Description
+### Relevant Links
 
-Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
+Bugzilla: _
+TestRail: _
 
-### Bugzilla bug ID
+### Description of Code / Doc Changes
 
-**Testrail:**
-**Link:**
+_Leave a bullet-pointed list of changes you made._
 
-### Type of change
+### Process Changes Required
 
-Please delete options that are not relevant.
+_Mark the relevant boxes:_
 
-- [ ] New Test
-- [ ] New POM
-- [ ] Other Changes (Please specify)
+- [ ] Adds a dependency (rerun `pipenv install`)
+- [ ] Changes the BasePage
+- [ ] Changes or creates a BOM/POM (name the object model): _
+- [ ] Changes CI flow
+- [ ] Changes scheduled Beta or DevEdition
+- [ ] Changes Git hooks or Github settings
+- [ ] Changes L10n harness
 
-### How does this resolve / make progress on that bug?
+### Screenshots or Explanations
 
-Please describe the progress or significance with respect to the bug listed above.
+_If you need to explain your code, do it here._
 
-### Screenshots / Explanations
+### Comments or Future Work
 
-Please upload any relevant media or add a relevant description with respect to the bug listed above.
+_Do we need to start another PR soon to address something you saw while working on this?_
 
-### Comments / Concerns
+### Workflow Checklist
 
-Please add a short blurb about any comments or concerns that this change might cause.
+- [ ] Please request reviewers
+- [ ] If this is an unblocker, please post in Slack.
+- [ ] If asked to address comments, please resolve conversations.
+- [ ] If asked to change code, please re-request review from the person who wanted changes.
+
+Thank you!

choose_ci_set.py

@@ -139,8 +139,8 @@ def dedupe(run_list: list, slash: str) -> list:
         .splitlines()
     )
 
-    main_conftest = os.path.join(SCRIPT_DIR, "conftest.py")
-    base_page = os.path.join(SCRIPT_DIR, "modules", "page_base.py")
+    main_conftest = "conftest.py"
+    base_page = os.path.join("modules", "page_base.py")
 
     if main_conftest in committed_files or base_page in committed_files:
         # Run all the tests (no files as arguments) if main conftest or basepage changed

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

@@ -29,26 +29,11 @@ def test_demo_ad_autofill_name_org(
     # Click the "Save" button
     autofill_popup.click_doorhanger_button("save")
 
-    # Double inside Name field and select a saved address entry from the dropdown
-    address_autofill.double_click("form-field", labels=["name"])
-
-    # Click on the first element from the autocomplete dropdown
-    first_item = autofill_popup.get_nth_element(1)
-    autofill_popup.click_on(first_item)
-
-    # Verify autofill data
-    address_autofill.verify_autofill_data(address_autofill_data, region, util)
-
-    # Double inside Name field and select clear form autofill
-    address_autofill.double_click("form-field", labels=["name"])
-    autofill_popup.click_clear_form_option()
-
-    # Double inside Organization field and select a saved address entry from the dropdown
-    address_autofill.double_click("form-field", labels=["organization"])
-
-    # Click on the first element from the autocomplete dropdown
-    first_item = autofill_popup.get_nth_element(1)
-    autofill_popup.click_on(first_item)
-
-    # Verify autofill data
-    address_autofill.verify_autofill_data(address_autofill_data, region, util)
+    # List of field labels to be autofilled and verified
+    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
+        )

l10n_CM/Unified/test_demo_ad_autofill_phone_email.py

@@ -30,26 +30,11 @@ def test_demo_ad_autofill_phone_email(
     # Click the "Save" button
     autofill_popup.click_doorhanger_button("save")
 
-    # Double inside phone field and select a saved address entry from the dropdown
-    address_autofill.double_click("form-field", labels=["tel"])
-
-    # Click on the first element from the autocomplete dropdown
-    first_item = autofill_popup.get_nth_element(1)
-    autofill_popup.click_on(first_item)
-
-    # Verify autofill data
-    address_autofill.verify_autofill_data(address_autofill_data, region, util)
-
-    # Double inside phone field and select clear form autofill
-    address_autofill.double_click("form-field", labels=["tel"])
-    autofill_popup.click_clear_form_option()
-
-    # Double inside email field and select a saved address entry from the dropdown
-    address_autofill.double_click("form-field", labels=["email"])
-
-    # Click on the first element from the autocomplete dropdown
-    first_item = autofill_popup.get_nth_element(1)
-    autofill_popup.click_on(first_item)
-
-    # Verify autofill data
-    address_autofill.verify_autofill_data(address_autofill_data, region, util)
+    # List of field labels to be autofilled and verified
+    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
+        )

l10n_CM/Unified/test_demo_ad_clear_address_fields.py

@@ -0,0 +1,43 @@
+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 "2888565"
+
+
+def test_demo_ad_clear_address_fields(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888565 - Verify clear functionality after selecting an entry from address fields
+    """
+    # Create fake data and fill it in
+    address_autofill.open()
+    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")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = [
+        "street-address",
+        "address-level2",
+        "address-level1",  # This will be skipped for DE/FR
+        "postal-code",
+        "country",
+    ]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.clear_and_verify(autofill_popup, field, address_autofill_data)

l10n_CM/Unified/test_demo_ad_clear_name_org.py

@@ -0,0 +1,37 @@
+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 "2888560"
+
+
+def test_demo_ad_clear_name_org(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888560 - Verify clear functionality after selecting an entry from name/org fields
+    """
+    # Create fake data and fill it in
+    address_autofill.open()
+    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")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = ["name", "organization"]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.clear_and_verify(autofill_popup, field, address_autofill_data)

l10n_CM/Unified/test_demo_ad_clear_tel_email.py

@@ -0,0 +1,38 @@
+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 "2888571"
+
+
+def test_demo_ad_clear_tel_email(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888571 - Verify clear functionality after selecting an entry from tele/email fields
+    """
+
+    # Create fake data and fill it in
+    address_autofill.open()
+    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")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = ["email", "tel"]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.clear_and_verify(autofill_popup, field, address_autofill_data)