Merge branch 'main' into philimon/dynamic_addressfill

Author: philimon-reset

.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

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -29,26 +29,13 @@ 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,13 @@ 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_cc_autofill_from_dropdown.py

@@ -0,0 +1,40 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object import AboutPrefs, CreditCardFill
+from modules.util import Utilities
+
+
+
+@pytest.fixture()
+def test_case():
+    return "2886600"
+
+
+def test_cc_autofill_from_dropdown(
+    driver: Firefox,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+    credit_card_fill_obj: CreditCardFill,
+
+):
+    """
+    Verify that saved credit card information is autofilled correctly when selected from the dropdown,
+    except for the CVV field.
+    """
+
+    # Open credit card form page
+    credit_card_fill_obj.open()
+
+    # Create and save fake credit card data
+    credit_card_data = util.fake_credit_card_data()
+    credit_card_fill_obj.fill_credit_card_info(credit_card_data)
+    autofill_popup.click_doorhanger_button("save")
+
+    # Autocomplete and clear all fields
+    credit_card_fill_obj.autofill_and_clear_all_fields(autofill_popup, credit_card_data)
+
+    # 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()

l10n_CM/region/Unified.json

@@ -12,6 +12,7 @@
         "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_dropdown_presence.py",
+        "test_demo_cc_autofill_from_dropdown.py",
         "test_demo_cc_yellow_highlight.py",
         "test_demo_ad_autofill_address_fields.py",
         "test_demo_ad_yellow_highlight_name_org.py",

modules/page_base.py

@@ -674,7 +674,9 @@ def wait_for_num_tabs(self, num_tabs: int) -> Page:
         try:
             self.wait.until(lambda _: len(self.driver.window_handles) == num_tabs)
         except TimeoutException:
-            logging.warn("Timeout waiting for the number of windows to be:", num_tabs)
+            logging.warning(
+                "Timeout waiting for the number of windows to be:", num_tabs
+            )
         return self
 
     def switch_to_new_tab(self) -> Page:
@@ -723,9 +725,11 @@ def open_and_switch_to_private_window_via_keyboard(self) -> Page:
             self.actions.send_keys("p")
             self.actions.key_up(Keys.SHIFT)
             self.actions.key_up(mod_key).perform()
-        expected_window_count = window_count + 1
-        self.wait_for_num_windows(expected_window_count)
-        self.switch_to_new_window()
+            expected_window_count = window_count + 1
+            self.wait_for_num_windows(expected_window_count)
+            self.switch_to_new_window()
+            self.title_contains("Private")
+        self.driver.get("about:blank")
         return self
 
     def switch_to_frame(self, frame: str, labels=[]) -> Page: