Merge branch 'main' into philimon/suite_refactor

Author: philimon-reset

.github/workflows/check-beta.yml

@@ -11,10 +11,13 @@ permissions:
 jobs:
   Check-Beta-Version:
     runs-on: ubuntu-latest
+    outputs:
+      reportable: ${{ steps.reportable.outputs.test }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Check if the run is reportable
+        id: reportable
         env: 
           TESTRAIL_REPORT: true
           TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
@@ -23,8 +26,9 @@ jobs:
         run: |
           pip3 install 'pipenv==2023.11.15';
           pipenv install
-          pipenv run python -c 'from modules import testrail_integration as tri; import sys; sys.exit(0) if tri.reportable() else sys.exit(100)'
+          echo test=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable())') >> "$GITHUB_OUTPUT"
   Run-Smoke-Tests:
     needs: Check-Beta-Version
+    if: ${{ needs.Check-Beta-Version.outputs.reportable == 'True' }}
     uses: ./.github/workflows/smoke.yml
     secrets: inherit

SELECTOR_INFO.md

@@ -1353,6 +1353,20 @@ Description: Save address doorhanger
 Location: Address bar
 Path to .json: modules/data/autofill_popup.components.json
 ```
+```
+Selector Name: address-doorhanger-name
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:first-of-type span"
+Description: Save address doorhanger name section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-org
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(2) span"
+Description: Save address doorhanger organization section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
 #### context_menu
 ```
 Selector Name: context-menu-search-selected-text
@@ -2835,6 +2849,13 @@ Location: Search mode of awesomebar
 Path to .json: modules/data/navigation.components.json
 ```
 ```
+Selector Name: contextual_search_button_awesome_bar
+Selector Data: "span.urlbarView-dynamic-actions-button-0.urlbarView-action-btn[data-action='matched-contextual-search']"
+Description: Contextual search button 
+Location: Address bar
+Path to .json: modules/data/navigation.components.json
+```
+```
 Selector Name: refresh-button-awesome-bar
 Selector Data: .urlbarView-action-btn[data-action=refresh]
 Description: Refresh button in the awesome bar

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -0,0 +1,64 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_about_pages import AboutConfig
+from modules.page_object_autofill import AddressFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888701"
+
+
+def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
+    driver: Firefox, region: str
+):
+    """
+    C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
+    """
+    # instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+    about_config = AboutConfig(driver)
+    browser_action_obj = BrowserActions(driver)
+
+    # Change pref value of region
+    about_config.change_config_value("browser.search.region", region)
+
+    # 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)
+
+    # The "Save address?" doorhanger is displayed
+    address_autofill_popup.element_visible("address-save-doorhanger")
+
+    # containing name field
+    expected_name = address_autofill_data.name
+    address_autofill_popup.element_has_text("address-doorhanger-name", expected_name)
+
+    # containing org field
+    expected_org = address_autofill_data.organization
+    address_autofill_popup.element_has_text("address-doorhanger-org", expected_org)
+
+    # Click the "Save" button
+    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_save_addresses_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+
+    # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization
+    elements = about_prefs.get_elements("saved-addresses-values")
+    expected_values = [expected_name, expected_org]
+    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!"

l10n_CM/Unified/test_demo_cc_dropdown-presence.py

@@ -0,0 +1,41 @@
+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 BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2886598"
+
+
+def test_dropdown_presence_credit_card(driver: Firefox):
+    """
+    C2886598 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
+    """
+
+    # 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_obj = 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)
+    credit_card_sample_data = util.fake_credit_card_data()
+    about_prefs_cc_popup.click_on(
+        "panel-popup-button", labels=["autofill-manage-add-button"]
+    )
+    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+
+    # Open credit card form page
+    credit_card_fill_obj.open()
+
+    # Verify autofill dropdown is displayed only for the eligible fields
+    credit_card_fill_obj.verify_autofill_dropdown_all_fields(autofill_popup_obj)

l10n_CM/region/CA.json

@@ -3,6 +3,8 @@
     "tests": [
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py"
+        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

l10n_CM/region/DE.json

@@ -3,6 +3,8 @@
     "tests": [
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py"
+        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

l10n_CM/region/FR.json

@@ -3,6 +3,8 @@
     "tests": [
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py"
+        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

l10n_CM/region/US.json

@@ -3,6 +3,8 @@
     "tests": [
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py"
+        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

modules/browser_object_autofill_popup.py

@@ -23,18 +23,15 @@ def verify_element_displayed(self, reference: Union[str, tuple, WebElement]):
         """Confirms that an element exists in popup"""
         self.element_clickable(reference)
 
-    def verify_no_popup_panel(self):
-        """Verifies that the autofill popup does NOT appear"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            element = self.get_element("autofill-panel")
-            self.expect_not(EC.element_to_be_clickable(element))
+    def ensure_autofill_dropdown_not_visible(self):
+        """Verifies that the autofill dropdown does NOT appear"""
+        self.element_not_visible("select-form-option")
+        return self
 
-    def verify_popup(self):
-        """Verifies that the autofill popup is clickable"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.expect(
-                EC.element_to_be_clickable(self.get_element("select-form-option"))
-            )
+    def ensure_autofill_dropdown_visible(self):
+        """Verifies that the autofill dropdown appears"""
+        self.element_visible("select-form-option")
+        return self
 
     # Interaction with popup elements
     def click_doorhanger_button(self, button_type: str) -> BasePage:

modules/browser_object_navigation.py

@@ -23,6 +23,14 @@ class Navigation(BasePage):
         "History": "^",
         "Actions": ">",
     }
+    VALID_SEARCH_MODES = {
+        "Google",
+        "eBay",
+        "Amazon.com",
+        "Bing",
+        "DuckDuckGo",
+        "Wikipedia (en)",
+    }
 
     def __init__(self, driver: Firefox, **kwargs):
         super().__init__(driver, **kwargs)
@@ -181,6 +189,35 @@ def click_in_awesome_bar(self) -> BasePage:
         return self
 
     @BasePage.context_chrome
+    def click_search_mode_switcher(self) -> BasePage:
+        """
+        click search mode switcher
+        """
+        self.search_mode_switcher = self.get_element("searchmode-switcher")
+        self.search_mode_switcher.click()
+        return self
+
+    @BasePage.context_chrome
+    def set_search_mode(self, search_mode: str) -> BasePage:
+        """
+        set new search location if search_mode in VALID_SEARCH_MODES
+
+        Parameter:
+            search_mode (str): search mode to be selected
+
+        Raises:
+            StopIteration: if a valid search mode is not found in the list of valid elements.
+        """
+        # check if search_mode is valid, otherwise raise error.
+        if search_mode not in self.VALID_SEARCH_MODES:
+            raise ValueError("search location is not valid.")
+        # switch to chrome context
+        # get list of all valid search modes and filter by label
+        self.get_element(
+            "search-mode-switcher-option", labels=[search_mode]
+        ).click()
+        return self
+
     def context_click_in_awesome_bar(self) -> BasePage:
         self.set_awesome_bar()
         actions = ActionChains(self.driver)
@@ -346,3 +383,8 @@ def open_searchmode_switcher_settings(self):
         self.click_on("searchmode-switcher")
         self.click_on("searchmode-switcher-settings")
         return self
+
+    @BasePage.context_chrome
+    def select_element_in_nav(self, element: str) -> BasePage:
+        self.get_element(element).click()
+        return self