merge main

Author: ben-c-at-moz

.github/workflows/check-beta.yml

@@ -2,11 +2,11 @@ name: Check new beta version
 
 on:
   schedule:
-    - cron: "49 */1 * * *"
+    - cron: "12 */1 * * *"
 env:
   LATEST: ""
 permissions:
-  contents: 'write'
+  contents: "write"
 
 jobs:
   Check-Beta-Version:
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Check if the run is reportable
         id: reportable
-        env: 
+        env:
           TESTRAIL_REPORT: true
           TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
           TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
@@ -29,19 +29,18 @@ jobs:
           pipenv install
           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: 
+  Run-Win-Smoke:
     needs: Check-Beta-Version
     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: 
+  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/check-devedition.yml

@@ -0,0 +1,48 @@
+name: Check new devedition version
+
+on:
+  schedule:
+    - cron: "46 */12 * * *"
+env:
+  LATEST: ""
+permissions:
+  contents: "write"
+
+jobs:
+  Check-DevEdition-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 }}
+          TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
+          TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
+          FX_CHANNEL: "devedition"
+        run: |
+          pip3 install 'pipenv==2023.11.15';
+          pipenv install
+          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.win_reportable == 'True' }}
+    uses: ./.github/workflows/smoke.yml
+    with:
+      channel: "devedition"
+      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:
+      channel: "devedition"
+      job_to_run: Smoke-MacOS
+    secrets: inherit

.github/workflows/smoke.yml

@@ -6,10 +6,16 @@ on:
   pull_request:
   workflow_call:
     inputs:
-      job_to_run: 
+      channel:
+        description: "Channel to run tests against"
+        default: "beta"
+        type: string
+        required: false
+      job_to_run:
         required: true
         type: string
 env:
+  FX_CHANNEL: ${{ inputs.channel }}
   TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
   TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
@@ -137,7 +143,7 @@ jobs:
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on MacOS";
       - name: Install dependencies
-        id: setup        
+        id: setup
         run: |
           mkdir -p artifacts;
           pip3 install 'pipenv==2023.11.15';

collect_executables.py

@@ -102,6 +102,33 @@ def get_gd_platform():
     if not language:
         language = "en-US"
 
+    if channel == "-devedition":
+        this_devedition = BACKSTOP
+        fx_download_dir_url = (
+            "https://archive.mozilla.org/pub/devedition/releases/135.0b5/"
+        )
+
+        while True:
+            (major, _) = this_devedition.split(".")
+            major = int(major)
+            this_devedition = f"{major + 1}.0b5"
+            next_candidate = f"https://archive.mozilla.org/pub/devedition/releases/{this_devedition}/"
+
+            rs = requests.get(next_candidate)
+            if rs.status_code > 399:
+                break
+
+            fx_download_dir_url = next_candidate
+
+        devedition_version = fx_download_dir_url.split("/")[-2]
+        if NUMBER_ONLY:
+            print(devedition_version)
+        else:
+            print(
+                f"{fx_download_dir_url}{get_fx_platform()}/{language}/Firefox%20{devedition_version}.{get_fx_executable_extension()}"
+            )
+        exit()
+
     candidate_exists = True
     this_beta = BACKSTOP
     while candidate_exists:

l10n_CM/Unified/conftest.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture()
 def region():
-    return os.environ.get("STARFOX_REGION", "US")
+    return os.environ.get("FX_REGION", "US")
 
 
 @pytest.fixture()

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -1,6 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
+from l10n_CM.Unified.conftest import autofill_popup
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
@@ -11,43 +12,44 @@ def test_case():
     return "2888558"
 
 
-def test_demo_ad_autofill_name_org(driver: Firefox, region: str):
+def test_demo_ad_autofill_name_org(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+):
     """
     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")
+    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)
+    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"])
-    address_autofill_popup.click_clear_form_option()
+    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)
+    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)

l10n_CM/Unified/test_demo_ad_autofill_phone_email.py

@@ -11,43 +11,45 @@ def test_case():
     return "2888569"
 
 
-def test_demo_ad_autofill_phone_email(driver: Firefox, region: str):
+def test_demo_ad_autofill_phone_email(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+):
     """
     C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for tele/email 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")
+    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 = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    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"])
-    address_autofill_popup.click_clear_form_option()
+    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 = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    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)

l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -20,7 +20,6 @@ def region():
 @pytest.fixture()
 def add_prefs(region: str):
     return [
-        ("browser.search.region", region),
         ("extensions.formautofill.creditCards.supportedCountries", region),
         ("extensions.formautofill.addresses.supported", "on"),
     ]

l10n_CM/Unified/test_demo_ad_yellow_highlight.py

@@ -12,31 +12,30 @@ def test_case():
 
 
 def test_address_yellow_highlight_on_name_organization_fields(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    util: Utilities,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888559 - Verify the yellow highlight appears on autofilled fields for name and organization.
     """
 
-    # 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")
+    autofill_popup.click_doorhanger_button("save")
 
     # Double click inside phone 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)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify the name and organization fields are highlighted
     address_autofill.verify_field_yellow_highlights(

l10n_CM/Unified/test_demo_ad_yellow_highlight_phone_email.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 "2888570"
+
+
+def test_address_yellow_highlight_address_fields(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888570 - Verify the yellow highlight appears on autofilled fields for the email and phone 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")
+
+    # Double click 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 the email and phone fields are highlighted
+    address_autofill.verify_field_yellow_highlights(
+        fields_to_test=["email", "tel"], expected_highlighted_fields=["email", "tel"]
+    )