Merge branch 'main' into philimon/suite_refactor

Author: Tracy-Walker

.github/workflows/check-beta.yml

@@ -12,7 +12,8 @@ jobs:
   Check-Beta-Version:
     runs-on: ubuntu-latest
     outputs:
-      reportable: ${{ steps.reportable.outputs.test }}
+      win_reportable: ${{ steps.reportable.outputs.win }}
+      mac_reportable: ${{ steps.reportable.outputs.mac }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -26,9 +27,21 @@ jobs:
         run: |
           pip3 install 'pipenv==2023.11.15';
           pipenv install
-          echo test=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable())') >> "$GITHUB_OUTPUT"
-  Run-Smoke-Tests:
+          echo win=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable("Windows"))') >> "$GITHUB_OUTPUT"
+          echo mac=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable("Darwin"))') >> "$GITHUB_OUTPUT"
+  Run-Win-Smoke: 
     needs: Check-Beta-Version
-    if: ${{ needs.Check-Beta-Version.outputs.reportable == 'True' }}
+    if: ${{ needs.Check-Beta-Version.outputs.win_reportable == 'True' }}
     uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-Windows
     secrets: inherit
+
+  Run-Mac-Smoke: 
+    needs: Check-Beta-Version
+    if: ${{ needs.Check-Beta-Version.outputs.mac_reportable == 'True' }}
+    uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-MacOS
+    secrets: inherit
+            

.github/workflows/smoke.yml

@@ -5,6 +5,10 @@ run-name: ${{ github.actor }} is running smoke tests
 on:
   pull_request:
   workflow_call:
+    inputs:
+      job_to_run: 
+        required: true
+        type: string
 env:
   TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
@@ -30,7 +34,7 @@ jobs:
         with:
           python-version: "3.11"
       - name: Set Environment
-        if: ${{ github.event_name == 'schedule' }}
+        if: ${{ inputs.job_to_run == 'Smoke-Windows' }}
         run: |
           $env_contents = @"
           TESTRAIL_REPORT='true'
@@ -128,7 +132,7 @@ jobs:
           exit $?
           echo "Triggered by event: ${{ github.event_name }}"
       - name: Set Environment
-        if: ${{ github.event_name == 'schedule' }}
+        if: ${{ inputs.job_to_run == 'Smoke-MacOS' }}
         run: |
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on MacOS";

SELECTOR_INFO.md

@@ -571,6 +571,20 @@ Location: about:preferences#privacy Saved Addresses popup dialog
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: saved-credit-cards
+Selector Data: "credit-cards"
+Description: The element that contains the saved credit cards
+Location: about:preferences#privacy Saved Credit Cards popup dialog
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: saved-credit-cards-values
+Selector Data: "#credit-cards option"
+Description: The element that contains the saved credit cards values
+Location: about:preferences#privacy Saved Credit Cards popup dialog
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: panel-popup-stack
 Selector Data: "dialogStack"
 Description: The element that contains the credit card profile values
@@ -1196,6 +1210,69 @@ Description: "Submit" button
 Location: At the bottom of the autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
 Path to .json: modules/data/address_fill.components.json
 ```
+```
+Selector Name: name-field
+Selector Data: "input[autocomplete=name]"
+Description: Name field
+Location: Name field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: org-field
+Selector Data: "input[autocomplete=organization]"
+Description: Organization field
+Location: Organization field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: street-field
+Selector Data: "input[autocomplete=street-address]"
+Description: Street field
+Location: Street field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: add-level2-field
+Selector Data: "input[autocomplete=address-level2]"
+Description: Address level 2 field
+Location: Address level 2 field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: add-level1-field
+Selector Data: "input[autocomplete=address-level1]"
+Description: Address level 1 field
+Location: Address level 1 field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: zip-field
+Selector Data: "input[autocomplete=postal-code]"
+Description: Zip field
+Location: Zip field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: country-field
+Selector Data: "input[autocomplete=country]"
+Description: Country field
+Location: Country field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: email-field
+Selector Data: "input[autocomplete=email]"
+Description: Email field
+Location: Email field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
+```
+Selector Name: phone-field
+Selector Data: "input[autocomplete=tel]"
+Description: Phone field
+Location: Phone field on autofill address demo page - https://mozilla.github.io/form-fill-examples/basic.html
+Path to .json: modules/data/address_fill.components.json
+```
 #### amo_languages
 ```
 Selector Name: language-addons-title

collect_executables.py

@@ -152,8 +152,17 @@ def get_gd_platform():
     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
     response = requests.get(fx_download_dir_url)
     status = response.status_code
-    if status < 300:
-        response_text = response.text
+    response_text = None
+    for _ in range(3):
+        if status < 300:
+            response_text = response.text
+        else:
+            sleep(3)
+            response = requests.get(fx_download_dir_url)
+            status = response.status_code
+
+    if response_text is None:
+        exit(f"Could not find build at {fx_download_dir_url}.")
 
     # Parse the HTML content
     soup = BeautifulSoup(response_text, "html.parser")

l10n_CM/Unified/conftest.py

@@ -1,7 +1,13 @@
 import os
+from typing import List
 
 import pytest
 
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill, CreditCardFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import Utilities
+
 
 @pytest.fixture()
 def region():
@@ -10,17 +16,47 @@ def region():
 
 @pytest.fixture()
 def add_prefs(region: str):
-    return [
+    return []
+
+
+@pytest.fixture()
+def set_prefs(add_prefs: List[tuple[str, str | bool]], region: str):
+    """Set prefs"""
+    prefs = [
         ("extensions.formautofill.creditCards.reauth.optout", False),
         ("extensions.formautofill.reauth.enabled", False),
         ("browser.aboutConfig.showWarning", False),
         ("browser.search.region", region),
     ]
+    prefs.extend(add_prefs)
+    return prefs
 
 
 @pytest.fixture()
-def set_prefs(add_prefs: dict):
-    """Set prefs"""
-    prefs = []
-    prefs.extend(add_prefs)
-    return prefs
+def address_autofill(driver):
+    yield AddressFill(driver)
+
+
+@pytest.fixture()
+def autofill_popup(driver):
+    yield AutofillPopup(driver)
+
+
+@pytest.fixture()
+def util():
+    yield Utilities()
+
+
+@pytest.fixture()
+def about_prefs_privacy(driver):
+    yield AboutPrefs(driver, category="privacy")
+
+
+@pytest.fixture()
+def about_prefs(driver):
+    yield AboutPrefs(driver)
+
+
+@pytest.fixture()
+def credit_card_fill_obj(driver):
+    yield CreditCardFill(driver)

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -4,7 +4,7 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -13,41 +13,37 @@ def test_case():
 
 
 def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
 ):
     """
     C2888703 - Verify Address data are captured in the Capture Doorhanger and stored in about:preferences
     """
-    # instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-    browser_action_obj = BrowserActions(driver)
-
-    # create fake data and fill it in
+    # 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")
+    autofill_popup.element_visible("address-save-doorhanger")
 
-    # containing Street Address field
+    # Containing Street Address field
     expected_street_add = address_autofill_data.street_address
-    address_autofill_popup.element_has_text(
-        "address-doorhanger-street", expected_street_add
-    )
 
-    # containing City field
+    autofill_popup.element_has_text("address-doorhanger-street", expected_street_add)
+
+    # Containing City field
     expected_city = address_autofill_data.address_level_2
-    address_autofill_popup.element_has_text("address-doorhanger-city", expected_city)
+    autofill_popup.element_has_text("address-doorhanger-city", expected_city)
 
     expected_state = address_autofill_data.address_level_1
     if region not in ["FR", "DE"]:
         state_abbreviation = util.get_state_province_abbreviation(expected_state)
-        address_autofill_popup.element_has_text(
-            "address-doorhanger-state", state_abbreviation
-        )
+        autofill_popup.element_has_text("address-doorhanger-state", state_abbreviation)
 
     # Verify Zip Code field (Different selector for DE/FR)
     expected_zip = address_autofill_data.postal_code
@@ -56,24 +52,23 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
         if region in ["FR", "DE"]
         else "address-doorhanger-zip"
     )
-    address_autofill_popup.element_has_text(zip_selector, expected_zip)
 
-    # containing Country field
+    autofill_popup.element_has_text(zip_selector, expected_zip)
+
+    # Containing Country field
     expected_country = address_autofill_data.country
-    address_autofill_popup.element_has_text(
-        "address-doorhanger-country", expected_country
-    )
+
+    autofill_popup.element_has_text("address-doorhanger-country", expected_country)
 
     # Click the "Save" button
-    address_autofill_popup.click_doorhanger_button("save")
+    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)
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # Verify saved addresses
-    elements = about_prefs.get_elements("saved-addresses-values")
+    elements = about_prefs_privacy.get_elements("saved-addresses-values")
 
     # Expected values for verification
     expected_values = [

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -0,0 +1,53 @@
+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 "2888558"
+
+
+def test_demo_ad_autofill_name_org(driver: Firefox, region: str):
+    """
+    C2888558 - Verify Autofill functionality when selecting an entry from the dropdown for name/org fields
+    """
+    # Instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+
+    # 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
+    address_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 = address_autofill_popup.get_nth_element(1)
+    address_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"])
+    address_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 = address_autofill_popup.get_nth_element(1)
+    address_autofill_popup.click_on(first_item)
+
+    # Verify autofill data
+    address_autofill.verify_autofill_data(address_autofill_data, region, util)