Merge branch 'main' into anca/cm-ca-staples

Author: soncuteanca

.github/workflows/l10n-write-mappings.yml

@@ -0,0 +1,31 @@
+---
+name: L10N output mapping splits
+
+run-name: ${{ github.actor }} is writing L10N mapping splits
+on:
+  schedule:
+    - cron: "0 0 * * 1"
+
+permissions:
+  contents: "write"
+
+jobs:
+  Select-Channels:
+    runs-on: ubuntu-latest
+    outputs:
+      channels: ${{ steps.splits.outputs.channels }}
+    steps:
+      - name: Create app token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.BOT_CLIENT_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+      - name: Select test channels
+        id: splits
+        run: |
+          python3 choose_l10n_beta_split.py

.github/workflows/l10n.yml

@@ -92,25 +92,6 @@ jobs:
             exit $EXIT_CODE;
           fi
           exit $SCRIPT_EXIT_CODE;
-      - name: Run L10N Tests in MacOS (Headed)
-        if: steps.setup.conclusion == 'success' && always()
-        env:
-          FX_EXECUTABLE: /Volumes/${{ steps.setup.outputs.app_name }}/${{ steps.setup.outputs.app_name }}.app/Contents/MacOS/firefox
-          REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
-        run: |
-          mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
-          echo "0" > TEST_EXIT_CODE;
-          while IFS= read -r line; do
-            echo "Running tests for: $line";
-            pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
-          done < selected_l10n_mappings;
-          ls artifacts-mac/* &>/dev/null || echo "No mappings to report" >> artifacts-mac/placeholder.txt
-          mv -n artifacts/* artifacts-mac/ || true;
-          EXIT_CODE=$(cat TEST_EXIT_CODE);
-          if [ $EXIT_CODE != 0 ]; then
-            exit $EXIT_CODE;
-          fi
-          exit $SCRIPT_EXIT_CODE;
       - name: Upload artifacts
         if: ${{ always() && github.event_name == 'pull_request' }}
         uses: actions/upload-artifact@v4
@@ -167,25 +148,6 @@ jobs:
             exit $EXIT_CODE;
           fi
           exit $SCRIPT_EXIT_CODE;
-      - name: Run Smoke Tests in Ubuntu (Headed)
-        if: steps.setup.conclusion == 'success' && always()
-        env:
-          REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
-          FX_EXECUTABLE: ./firefox/firefox
-        run: |
-          mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
-          echo "0" > TEST_EXIT_CODE;
-          while IFS= read -r line; do
-            echo "Running tests for: $line";
-            DISPLAY=:99 pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
-          done < selected_l10n_mappings;
-          ls artifacts-linux/* &>/dev/null || echo "No mappings to report" >> artifacts-linux/placeholder.txt
-          mv -n artifacts/* artifacts-linux/ || true;
-          EXIT_CODE=$(cat TEST_EXIT_CODE);
-          if [ $EXIT_CODE != 0 ]; then
-            exit $EXIT_CODE;
-          fi
-          exit $SCRIPT_EXIT_CODE;
       - name: Upload artifacts
         if: ${{ always() && inputs.is_pull_request == true }}
         uses: actions/upload-artifact@v4
@@ -277,47 +239,6 @@ jobs:
               exit [int]$EXIT_CODE
           }
           exit $env:SCRIPT_EXIT_CODE
-      - name: Run L10N Tests in Win (Headed)
-        if: steps.setup.conclusion == 'success' && always()
-        env:
-          REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
-        run: |
-          rm ./pyproject.toml;
-          mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
-          $env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
-          Write-Host "FX_EXECUTABLE: $FX_EXECUTABLE"
-          pipenv run python choose_l10n_ci_set.py
-          "0" | Set-Content -Path "TEST_EXIT_CODE"
-          $SCRIPT_EXIT_CODE = 0
-          Get-Content "selected_l10n_mappings" | ForEach-Object {
-              $line = $_
-              Write-Host "Running tests for: $line"
-              try {
-                  pipenv run python -m l10n_CM.run_l10n --fx-executable="$env:FX_EXECUTABLE" $line
-              } catch {
-                  $SCRIPT_EXIT_CODE = $_.Exception.HResult
-              }
-          }
-          rm artifacts/assets -r -Force -ErrorAction SilentlyContinue
-          Get-ChildItem -Path "artifacts" -ErrorAction SilentlyContinue | ForEach-Object {
-              $destPath = "artifacts-win\" + $_.Name
-              if (-not (Test-Path -Path $destPath)) {
-                  try {
-                      Move-Item -Path $_.FullName -Destination $destPath
-                  } catch {
-                      # Ignore errors and continue
-                  }
-              }
-          }
-          mkdir artifacts-win -Force
-          if (-not (Test-Path -Path "artifacts-win\*")) {
-            New-Item -Path "artifacts-win\placeholder.txt" -ItemType File -Value "no mappings to report."
-          }
-          $EXIT_CODE = Get-Content -Path "TEST_EXIT_CODE"
-          if ($EXIT_CODE -ne 0) {
-              exit [int]$EXIT_CODE
-          }
-          exit $env:SCRIPT_EXIT_CODE
       - name: Upload artifacts
         if: ${{ always() && inputs.is_pull_request == true }}
         uses: actions/upload-artifact@v4

Pipfile

@@ -16,7 +16,7 @@ pypom = "2.2.4"
 taskcluster-taskgraph = "==9.0.0"
 jsonpath-ng = "1.6.1"
 pillow = "<10.5"
-pyfxa = "0.7.0"
+pyfxa = "0.8.1"
 ruff = "0.9.6"
 pytest-rerunfailures = "14.0"
 slack-sdk = "3.31.0"

SELECTOR_INFO.md

@@ -2042,6 +2042,34 @@ Location: In the FxA signin page flow
 Path to .json: modules/data/fxa_home.components.json
 ```
 ```
+Selector Name: do-it-later-button
+Selector Data: "inline_recovery_key_setup_create_do_it_later"
+Description: Coninute fxa account creation flow
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: login-password-input
+Selector Data: "choice-pair-not-now"
+Description: Dont pair with phone now
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: signed-in-status
+Selector Data: "div[role='status']"
+Description: Sign in status
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: manage-sync-button
+Selector Data: "signup_confirmed_sync_manage_sync_button"
+Description: sign up and sync confirmation
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
 Selector Name: signin-otp-input
 Selector Data: "[data-testid='signin-token-code-input-field']"
 Description: The FxAccount One Time Password entry field
@@ -2994,7 +3022,7 @@ Path to .json: modules/data/navigation.components.json
 ```
 ```
 Selector Name: searchmode-switcher-settings
-Selector Data: searchmode-switcher-popup-search-settings-button
+Selector Data: menuitem[data-l10n-id='urlbar-searchmode-popup-search-settings-menuitem']
 Description: Search settings button in the searchmode switcher dropdown
 Location: Address bar
 Path to .json: modules/data/navigation.components.json

choose_l10n_beta_split.py

@@ -0,0 +1,38 @@
+import json
+import logging
+import sys
+from collections import defaultdict
+
+from choose_l10n_ci_set import valid_l10n_mappings
+
+
+def distribute_mappings_evenly(mappings):
+    """
+    Distribute the selected mappings into 3 splits and return the container.
+
+    Args:
+        mappings (dict): A dictionary of mappings, where the keys are sites and the values are sets of regions.
+    """
+    if not mappings:
+        return {}
+    # sort the mappings by the length of the regions per site
+    mappings = dict(sorted(mappings.items(), key=lambda val: len(val[1]), reverse=True))
+    # place the mappings into 3 containers evenly according to the load
+    loads = [0, 0, 0]
+    balanced_splits = [defaultdict(list) for _ in range(3)]
+    for site, regions in mappings.items():
+        min_idx = loads.index(min(loads))
+        balanced_splits[min_idx][site] = list(regions)
+        loads[min_idx] += len(regions)
+    return balanced_splits
+
+
+if __name__ == "__main__":
+    l10n_mappings = valid_l10n_mappings()
+    all_splits = distribute_mappings_evenly(l10n_mappings)
+    if not all_splits:
+        logging.warning("No valid l10n mappings")
+        sys.exit(1)
+    for idx, split in enumerate(all_splits, start=1):
+        with open(f"l10n_CM/beta_run_splits/l10n_split_{idx}.json", "w") as f:
+            json.dump(split, f)

choose_l10n_ci_set.py

@@ -34,35 +34,6 @@ def valid_l10n_mappings():
     return mapping
 
 
-def distribute_mappings_evenly(mappings, version):
-    """
-    Distribute the selected mappings if its a reportable run.
-
-    Args:
-        mappings (dict): A dictionary of mappings, where the keys are sites and the values are sets of regions.
-        version (int): The beta_version of the beta.
-    """
-    if not mappings:
-        return {}
-    if os.environ.get("TESTRAIL_REPORT"):
-        # sort the mappings by the length of the regions per site
-        mappings = dict(
-            sorted(mappings.items(), key=lambda val: len(val[1]), reverse=True)
-        )
-        # place the mappings into 3 containers evenly according to the load
-        loads = [0, 0, 0]
-        containers = [defaultdict(set) for _ in range(3)]
-        for key, value in mappings.items():
-            min_idx = loads.index(min(loads))
-            containers[min_idx][key] = value
-            loads[min_idx] += len(value)
-        # get container index according to beta beta_version
-        run_idx = version % 3
-        return containers[run_idx]
-    else:
-        return mappings
-
-
 def process_changed_file(f, selected_mappings):
     """
     process the changed file to add the site/region mappings.
@@ -108,6 +79,22 @@ def save_mappings(selected_container):
         f.writelines(current_running_mappings)
 
 
+def select_l10n_mappings(beta_version):
+    """
+    Select the correct l10n mappings.
+
+    Args:
+        beta_version: the current beta version.
+    """
+    beta_split = (beta_version % 3) + 1
+    if os.path.exists(f"l10n_CM/beta_run_splits/l10n_split_{beta_split}.json"):
+        with open(f"l10n_CM/beta_run_splits/l10n_split_{beta_split}.json", "r") as f:
+            current_split_mappings = {k: set(v) for k, v in json.load(f).items()}
+            return current_split_mappings
+    else:
+        return valid_l10n_mappings()
+
+
 if __name__ == "__main__":
     if os.path.exists(".env"):
         with open(".env") as fh:
@@ -134,11 +121,12 @@ def save_mappings(selected_container):
     except ValueError:
         # failsafe beta_version
         beta_version = 0
-    l10n_mappings = valid_l10n_mappings()
+    # choose split number
+    l10n_mappings = select_l10n_mappings(beta_version)
     sample_mappings = {k: v for k, v in l10n_mappings.items() if k.startswith("demo")}
     if os.environ.get("TESTRAIL_REPORT") or os.environ.get("MANUAL"):
         # Run all tests if this is a scheduled beta or a manual run
-        save_mappings(distribute_mappings_evenly(l10n_mappings, beta_version))
+        save_mappings(l10n_mappings)
         sys.exit(0)
 
     re_set_all = [
@@ -199,5 +187,5 @@ def save_mappings(selected_container):
                 selected_mappings |= sample_mappings
                 break
 
-    save_mappings(distribute_mappings_evenly(selected_mappings, beta_version))
+    save_mappings(selected_mappings)
     sys.exit(0)

ci_l10n_pyproject_headed.toml

@@ -31,6 +31,8 @@ The harness relies on several configuration files:
     ]
 }
 ```
+**NOTE**: If both the address and credit card tests are skipped for the site, do not add it to the region files.
+
 - **Site Test Configuration**: Located in `constants/{site_name}.json` or `constants/{site_name}/{region}.json`, defining site-specific test configurations and skipped tests. Here we map the attributes for either `AutofillAddressBase` or `CreditCardBase` to the corresponding selectors.
 
 ```aiignore

l10n_CM/README.md

@@ -106,9 +106,9 @@ def cc_site_data(live_site, region):
 @pytest.fixture
 def is_live_site(live_site, region):
     """Determine if the site is live.
-    Treat demo IT and ES as a live site until the doorhanger bug is fixed.
+    Treat demo IT, ES and BE as a live site until the doorhanger bug is fixed.
     """
-    return live_site != "demo" or region in {"IT", "ES"}
+    return live_site != "demo" or region in {"IT", "ES", "BE"}
 
 
 @pytest.fixture(scope="session")

l10n_CM/Unified/conftest.py

@@ -38,7 +38,7 @@ def test_address_yellow_highlight_on_name_organization_fields(
         autofill_popup.ensure_autofill_dropdown_visible()
 
         # Click on the first element from the autocomplete dropdown
-        autofill_popup.select_nth_element(1)
+        autofill_popup.select_autofill_panel()
 
         field_to_test = ["given_name", "family_name", "name", "organization"]
         # Verify the name and organization fields are highlighted