Merge branch 'main' of github.com:mozilla/fx-desktop-qa-automation

Author: ben-c-at-moz

SELECTOR_INFO.md

@@ -1389,6 +1389,13 @@ Location: Appears as part of the dropdown under the autofill panel, within any e
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
+Selector Name: select-form-option-by-index
+Selector Data: ".autocomplete-richlistbox .autocomplete-richlistitem:nth:child({index})"
+Description: Select n individual entry within the autofill dropdown, using the index of the child.
+Location: Appears as part of the dropdown under the autofill panel, within any eligible form field when suggestions are available.
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
 Selector Name: clear-form-option
 Selector Data: ".autocomplete-richlistbox .autocomplete-richlistitem[ac-value='Clear Autofill Form']"
 Description: The "Clear Autofill Form" option in the dropdown that appears when interacting with an autofill-enabled input field

l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py

@@ -38,12 +38,17 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
 
     # containing phone field
     expected_phone = address_autofill_data.telephone
-    actual_phone = autofill_popup.get_cc_doorhanger_data("address-doorhanger-phone")
-    normalize_expected = util.normalize_regional_phone_numbers(expected_phone, region)
-    normalized_actual = util.normalize_regional_phone_numbers(actual_phone, region)
-    assert normalized_actual == normalize_expected, (
-        f"Phone number mismatch for {region} | Expected: {normalize_expected}, Got: {normalized_actual}"
-    )
+    # Skip verification if phone number isn't provided
+    if expected_phone:
+        with driver.context(driver.CONTEXT_CHROME):
+            actual_phone = autofill_popup.get_element("address-doorhanger-phone").text
+        normalize_expected = util.normalize_regional_phone_numbers(
+            expected_phone, region
+        )
+        normalized_actual = util.normalize_regional_phone_numbers(actual_phone, region)
+        assert normalized_actual == normalize_expected, (
+            f"Phone number mismatch for {region} | Expected: {normalize_expected}, Got: {normalized_actual}"
+        )
 
     # Click the "Save" button
     autofill_popup.click_doorhanger_button("save")

modules/browser_object_autofill_popup.py

@@ -80,6 +80,20 @@ def get_nth_element(self, index: str | int) -> WebElement:
                 )
             )
 
+    def select_nth_element(self, index: int):
+        """
+        Select the nth element from the autocomplete list
+        Arguments:
+            index (int): The index of the element to retrieve (1-based)
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.expect(
+                EC.visibility_of(
+                    self.get_element("select-form-option-by-index", labels=[str(index)])
+                )
+            )
+            self.get_element("select-form-option-by-index", labels=[str(index)]).click()
+
     def get_primary_value(self, element: WebElement) -> str:
         """
         Get the primary value from the autocomplete element

modules/data/autofill_popup.components.json

@@ -61,6 +61,12 @@
          "groups": []
     },
 
+    "select-form-option-by-index": {
+        "selectorData": ".autocomplete-richlistbox .autocomplete-richlistitem:nth-child({index})",
+        "strategy":"css",
+        "groups": []
+    },
+
     "update-card-info-popup-button": {
         "selectorData": "button[label='Update existing card']",
         "strategy": "css",

modules/page_base.py

@@ -3,6 +3,7 @@
 import os
 import platform
 import re
+import sys
 import time
 from copy import deepcopy
 from pathlib import Path
@@ -678,20 +679,55 @@ def wait_for_num_tabs(self, num_tabs: int) -> Page:
 
     def switch_to_new_tab(self) -> Page:
         """Get list of all window handles, switch to the newly opened tab"""
-        self.driver.switch_to.window(self.driver.window_handles[-1])
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            self.driver.switch_to.window(self.driver.window_handles[-1])
         return self
 
     def switch_to_new_window(self) -> Page:
         """Switch to the most recently opened window. Can be a standard or private window"""
-        all_window_handles = self.driver.window_handles
-        self.driver.switch_to.window(all_window_handles[-1])
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            all_window_handles = self.driver.window_handles
+            self.driver.switch_to.window(all_window_handles[-1])
         return self
 
     def wait_for_num_windows(self, num: int) -> Page:
         """Wait for the number of open tabs + windows to equal given int"""
         with self.driver.context(self.driver.CONTEXT_CONTENT):
             return self.wait_for_num_tabs(num)
 
+    def open_and_switch_to_new_window(self, browser_window: str) -> Page:
+        """
+        Opens a new browser window of the given type, then switches to it.
+
+        Parameters:
+            browser_window: Can be a standard 'window', 'tab' or 'private' browser window.
+        """
+        if browser_window == "private":
+            self.open_and_switch_to_private_window_via_keyboard()
+        else:
+            self.driver.switch_to.new_window(browser_window)
+        return self
+
+    def open_and_switch_to_private_window_via_keyboard(self) -> Page:
+        """
+        Opens a new private browsing window via keyboard shortcut and switch to it
+        """
+        # Keep track of window count to ensure we get a new one to switch to
+        window_count = len(self.driver.window_handles)
+
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            os_name = sys.platform
+            mod_key = Keys.COMMAND if os_name == "darwin" else Keys.CONTROL
+            self.actions.key_down(mod_key)
+            self.actions.key_down(Keys.SHIFT)
+            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()
+        return self
+
     def switch_to_frame(self, frame: str, labels=[]) -> Page:
         """Switch to inline document frame"""
         with self.driver.context(self.driver.CONTEXT_CHROME):

modules/page_object_autofill.py

@@ -145,35 +145,19 @@ def verify_autofill_dropdown_all_fields(self, ccp: AutofillPopup):
         self.double_click("form-field", labels=["cc-csc"])
         ccp.ensure_autofill_dropdown_not_visible()
 
-    def verify_four_fields(
-        self, ccp: AutofillPopup, credit_card_sample_data: CreditCardBase
+    def verify_credit_card_form_data(
+        self, credit_card_sample_data: CreditCardBase
     ) -> Autofill:
         """
-        Verifies that after clicking the autofill panel the information is filled correctly.
+        Verifies that the information is filled correctly.
 
         Attributes
         ----------
 
-        ccp: CreditCardPopup
-            The credit card popup object
-
         credit_card_sample_data: CreditCardBase
             The object that contains all the relevant information about the credit card autofill
         """
-        self.double_click("form-field", labels=["cc-name"])
         info_list = self.extract_credit_card_obj_into_list(credit_card_sample_data)
-        # Click on popup form value with name only
-        if self.sys_platform() == "Linux":
-            with self.driver.context(self.driver.CONTEXT_CHROME):
-                ccp.custom_wait(timeout=30, poll_frequency=0.5).until(
-                    EC.element_to_be_clickable(
-                        ccp.get_selector(
-                            "select-form-option-by-value", labels=[info_list[0]]
-                        )
-                    )
-                )
-        ccp.click_on("select-form-option-by-value", labels=[info_list[0]])
-
         for i in range(len(info_list)):
             self.element_attribute_contains(
                 "form-field", "value", info_list[i], labels=[self.fields[i]]
@@ -225,13 +209,19 @@ def update_field(
         self.fill_input_element(ba, field, field_data)
         self.click_form_button("submit")
 
-    def press_autofill_panel(self, credit_card_popoup_obj: AutofillPopup):
+    def press_autofill_panel(
+        self, autofill_popup: AutofillPopup, field: str = "cc-name"
+    ):
         """
         Presses the autofill panel that pops up after you double-click an input field
+
+        Argument:
+            field:  field to click to show autofill option.
         """
-        self.double_click("form-field", labels=["cc-name"])
+        self.double_click("form-field", labels=[field])
+        autofill_popup.ensure_autofill_dropdown_visible()
         with self.driver.context(self.driver.CONTEXT_CHROME):
-            credit_card_popoup_obj.get_element("select-form-option").click()
+            autofill_popup.get_element("select-form-option").click()
 
     def update_credit_card_information(
         self,
@@ -244,7 +234,6 @@ def update_credit_card_information(
         Updates the credit card based on field that is to be changed by first autofilling everything then updating
         the field of choice then pressing submit and handling the popup.
         """
-        self.press_autofill_panel(autofill_popup_obj)
         self.update_field(field_name, field_data, autofill_popup_obj)
         self.click_form_button("submit")
 
@@ -302,67 +291,39 @@ def verify_updated_information(
         # updating the profile accordingly
         self.update_credit_card_information(autofill_popup_obj, field_name, new_data)
 
-        # verifying the correct data
-        self.verify_four_fields(autofill_popup_obj, credit_card_sample_data)
-        return self
-
-    def update_cc_name(
-        self,
-        util: Utilities,
-        credit_card_sample_data: CreditCardBase,
-        autofill_popup_obj: AutofillPopup,
-    ) -> Autofill:
-        """
-        Generates a new name, updates the credit card information in the form.
-        """
-        new_cc_name = util.fake_credit_card_data().name
-        credit_card_sample_data.name = new_cc_name
-
-        self.verify_updated_information(
-            autofill_popup_obj,
-            credit_card_sample_data,
-            "cc-name",
-            credit_card_sample_data.name,
-        )
-        return self
-
-    def update_cc_exp_month(
-        self,
-        util: Utilities,
-        credit_card_sample_data: CreditCardBase,
-        autofill_popup_obj: AutofillPopup,
-    ) -> Autofill:
-        """
-        Generates a new expiry month, updates the credit card information in the form.
-        """
-        new_cc_exp_month = util.fake_credit_card_data().expiration_month
-        credit_card_sample_data.expiration_month = new_cc_exp_month
+        # autofill data
+        self.press_autofill_panel(autofill_popup_obj)
 
-        self.verify_updated_information(
-            autofill_popup_obj,
-            credit_card_sample_data,
-            "cc-exp-month",
-            credit_card_sample_data.expiration_month,
-        )
+        # verifying the correct data
+        self.verify_credit_card_form_data(credit_card_sample_data)
         return self
 
-    def update_cc_exp_year(
+    def update_cc(
         self,
         util: Utilities,
         credit_card_sample_data: CreditCardBase,
         autofill_popup_obj: AutofillPopup,
+        field: str,
     ) -> Autofill:
         """
-        Generates a new expiry year, updates the credit card information in the form.
+        Generates a new data for credit card according to field given, updates the credit card information in the form.
         """
-        new_cc_exp_year = util.fake_credit_card_data().expiration_year
-        credit_card_sample_data.expiration_year = new_cc_exp_year
+        cc_mapping = {
+            "cc-name": "name",
+            "cc-exp-month": "expiration_month",
+            "cc-exp-year": "expiration_year",
+            "cc-number": "card_number",
+        }
+        new_cc_data = getattr(util.fake_credit_card_data(), cc_mapping[field])
+        while new_cc_data == getattr(credit_card_sample_data, cc_mapping[field]):
+            new_cc_data = getattr(util.fake_credit_card_data(), cc_mapping[field])
+        setattr(credit_card_sample_data, cc_mapping[field], new_cc_data)
 
         self.verify_updated_information(
             autofill_popup_obj,
             credit_card_sample_data,
-            "cc-exp-year",
-            credit_card_sample_data.expiration_year,
+            field,
+            new_cc_data,
         )
         return self
 
@@ -383,6 +344,21 @@ def verify_clear_form_all_fields(self, autofill_popup_obj: AutofillPopup):
             self.double_click("form-field", labels=["cc-csc"])
             autofill_popup_obj.ensure_autofill_dropdown_not_visible()
 
+    def autofill_and_clear_all_fields(
+        self, autofill_popup: AutofillPopup, credit_card_data: CreditCardBase
+    ):
+        """
+        For each field select autofill option and clear.
+        """
+        for field in self.fields:
+            # press autofill panel for a field.
+            self.press_autofill_panel(autofill_popup, field)
+            # verify cc data in form.
+            self.verify_credit_card_form_data(credit_card_data)
+            # Clear the fields after verification
+            self.click_on("form-field", labels=[field])
+            autofill_popup.click_clear_form_option()
+
     def verify_field_yellow_highlights(self, expected_highlighted_fields=None):
         """
         Reuses the common highlight-check method from the base class.

modules/util.py

@@ -100,6 +100,8 @@ def __init__(self):
             "Nunavut": "NU",
             "Yukon": "YT",
         }
+        self.fake = None
+        self.locale = None
 
     def remove_file(self, path: str):
         try:
@@ -215,8 +217,13 @@ def create_localized_faker(self, country_code: str):
 
         try:
             # seed to get consistent data
-            Faker.seed(locale)
-            faker = Faker(locale)
+            if self.fake is None:
+                if locale != self.locale:
+                    Faker.seed(locale)
+                    self.locale = locale
+                self.fake = Faker(locale)
+            faker = self.fake
+            self.fake = faker
             faker.add_provider(internet)
             faker.add_provider(misc)
             return faker, True

tests/bookmarks_and_history/test_clear_all_history.py

@@ -20,7 +20,8 @@ def test_clear_all_history(driver: Firefox):
     """
     C172045: Verify that the user can Clear all the History
     """
-    panel_ui = PanelUi(driver).open()
+    panel_ui = PanelUi(driver)
+    panel_ui.open()
     gen_page = GenericPage(driver)
     panel_ui.open_history_menu()
     ba = BrowserActions(driver)

tests/bookmarks_and_history/test_clear_recent_history_displayed.py

@@ -13,7 +13,8 @@ def test_clear_recent_history_displayed(driver: Firefox):
     """
     C172043: Clear recent history panel displayed
     """
-    panel_ui = PanelUi(driver).open()
+    panel_ui = PanelUi(driver)
+    panel_ui.open()
 
     panel_ui.open_panel_menu()
     with driver.context(driver.CONTEXT_CHROME):

tests/bookmarks_and_history/test_open_websites_from_history.py

@@ -29,7 +29,8 @@ def test_open_websites_from_history(driver: Firefox):
     """
     C118807: Verify that the user can open websites from the Toolbar History submenu
     """
-    panel_ui = PanelUi(driver).open()
+    panel_ui = PanelUi(driver)
+    panel_ui.open()
 
     panel_ui.open_history_menu()