Merge branch 'main' into philimon/l10n_modify

philimon-reset · web-flow · commit 4ce2a84b5b06 · 2025-02-27T12:08:39.000+01:00
diff --git a/.github/workflows/check-beta.yml b/.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
-            
diff --git a/.github/workflows/check-devedition.yml b/.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
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -6,10 +6,15 @@ on:
   pull_request:
   workflow_call:
     inputs:
-      job_to_run: 
+      channel:
+        description: "Channel to run tests against"
+        default: "beta"
+        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 +142,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';
diff --git a/collect_executables.py b/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:
diff --git a/l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py b/l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py
@@ -39,8 +39,8 @@ 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_phone_number(expected_phone)
-    normalized_actual = util.normalize_phone_number(actual_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}"
     )
diff --git a/l10n_CM/Unified/test_demo_ad_yellow_highlight_phone_email.py b/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"]
+    )
diff --git a/l10n_CM/region/Unified.json b/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_yellow_highlight.py"
+    "test_demo_ad_verify_new_address_added.py",
+    "test_demo_ad_yellow_highlight_phone_email.py"
   ]
 }
diff --git a/modules/testrail_integration.py b/modules/testrail_integration.py
@@ -10,6 +10,7 @@
 
 FX_PRERC_VERSION_RE = re.compile(r"(\d+)\.(\d\d?)[ab](\d\d?)-build(\d+)")
 FX_RC_VERSION_RE = re.compile(r"(\d+)\.(\d\d?)(.*)")
+FX_DEVED_VERSION_RE = re.compile(r"(\d+)\.(\d\d?)b(\d\d?)")
 FX_RELEASE_VERSION_RE = re.compile(r"(\d+)\.(\d\d?)\.(\d\d?)(.*)")
 TESTRAIL_RUN_FMT = (
     "[{channel} {major}] Automated testing {major}.{minor}b{beta}-build{build}"
@@ -23,7 +24,18 @@ def get_plan_title(version_str: str, channel: str) -> str:
     """Given a version string, get the plan_title"""
 
     version_match = FX_PRERC_VERSION_RE.match(version_str)
-    if version_match:
+    if channel == "Devedition":
+        logging.info(f"DevEdition: {version_str}")
+        version_match = FX_DEVED_VERSION_RE.match(version_str)
+        (major, minor, beta) = [version_match[n] for n in range(1, 4)]
+        plan_title = (
+            TESTRAIL_RUN_FMT.replace("{channel}", channel)
+            .replace("{major}", major)
+            .replace("{minor}", minor)
+            .replace("{beta}", beta)
+            .split("-")[0]
+        )
+    elif version_match:
         logging.info(version_match)
         (major, minor, beta, build) = [version_match[n] for n in range(1, 5)]
         logging.info(f"major {major} minor {minor} beta {beta} build {build}")
@@ -87,8 +99,12 @@ def reportable(platform_to_test=None):
     tr_session = testrail_init()
     major_number, second_half = version.split(".")
     minor_num, build_num = second_half.split("-")
-    channel = "Beta" if "b" in minor_num else "Release"
-    # TODO: Logic for Nightly testing
+    channel = os.environ.get("FX_CHANNEL").title()
+    if not channel:
+        if "b" in minor_num:
+            channel = "Beta"
+        else:
+            channel = "Release"
 
     major_version = f"Firefox {major_number}"
     major_milestone = tr_session.matching_milestone(TESTRAIL_FX_DESK_PRJ, major_version)
@@ -102,10 +118,15 @@ def reportable(platform_to_test=None):
         major_milestone, f"{channel} {major_number}"
     )
     if not channel_milestone:
-        logging.warning(
-            f"Not reporting: Could not find matching submilestone for {channel} {major_number}"
-        )
-        return False
+        if channel == "Devedition":
+            channel_milestone = tr_session.matching_submilestone(
+                major_milestone, f"Beta {major_number}"
+            )
+        if not channel_milestone:
+            logging.warning(
+                f"Not reporting: Could not find matching submilestone for {channel} {major_number}"
+            )
+            return False
 
     plan_title = get_plan_title(version, channel)
     logging.warning(f"Plan title: {plan_title}")
@@ -347,7 +368,7 @@ def collect_changes(testrail_session: TestRail, report):
     """
 
     # Find milestone to attach to
-    channel = os.environ.get("STARFOX_CHANNEL")
+    channel = os.environ.get("FX_CHANNEL").title()
     if not channel:
         channel = "Beta"
     if channel == "Release":
@@ -394,6 +415,10 @@ def collect_changes(testrail_session: TestRail, report):
     channel_milestone = testrail_session.matching_submilestone(
         major_milestone, f"{channel} {major}"
     )
+    if (not channel_milestone) and channel == "Devedition":
+        channel_milestone = testrail_session.matching_submilestone(
+            major_milestone, f"Beta {major}"
+        )
 
     # Find plan to attach runs to, create if doesn't exist
     logging.info(f"Plan title: {plan_title}")
diff --git a/taskcluster/kinds/new-beta-qa/kind.yml b/taskcluster/kinds/new-beta-qa/kind.yml
@@ -47,6 +47,18 @@ tasks:
         mv ./ci_pyproject_headed.toml ./pyproject.toml;
         export REPORTABLE=1;
         pipenv run pytest --fx-executable $FX_EXECUTABLE tests;
+        export BETA_VERSION=$(pipenv run python collect_executables.py -n)
+        if ![[ "${BETA_VERSION}" == *"b6"* ]] && ![[ "${BETA_VERSION}" == *"b8"* ]]; then exit 0;
+        export FX_CHANNEL="devedition";
+        mv ./ci_pyproject.toml ./pyproject.toml;
+        ./collect_executables.sh;
+        pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
+        $FX_EXECUTABLE --version;
+        pipenv run pytest --fx-executable $FX_EXECUTABLE -n 4 tests;
+        export FAILURE=${?};
+        mv ./ci_pyproject_headed.toml ./pyproject.toml;
+        export REPORTABLE=1;
+        pipenv run pytest --fx-executable $FX_EXECUTABLE tests;
         exit $((${?} | ${FAILURE}))
     notify:
       recipients:

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",`
`13`	`13`	`"test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",`
`14`	`14`	`"test_demo_cc_dropdown_presence.py",`
`15`		`- "test_demo_cc_yellow_highlight.py"`
	`15`	`+ "test_demo_ad_verify_new_address_added.py",`
	`16`	`+ "test_demo_ad_yellow_highlight_phone_email.py"`
`16`	`17`	`]`
`17`	`18`	`}`