Skip to content

Commit 3825e47

Browse files
philimon-resetphilimon-reset
committed
Merge remote-tracking branch 'origin' into philimon/rework_ensure_visible
2 parents 7e981e2 + 0c95536 commit 3825e47

File tree

51 files changed

+709
-292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+709
-292
lines changed

‎.github/workflows/l10n.yml

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,6 @@ jobs:
9292
exit $EXIT_CODE;
9393
fi
9494
exit $SCRIPT_EXIT_CODE;
95-
- name: Run L10N Tests in MacOS (Headed)
96-
if: steps.setup.conclusion == 'success' && always()
97-
env:
98-
FX_EXECUTABLE: /Volumes/${{ steps.setup.outputs.app_name }}/${{ steps.setup.outputs.app_name }}.app/Contents/MacOS/firefox
99-
REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
100-
run: |
101-
mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
102-
echo "0" > TEST_EXIT_CODE;
103-
while IFS= read -r line; do
104-
echo "Running tests for: $line";
105-
pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
106-
done < selected_l10n_mappings;
107-
ls artifacts-mac/* &>/dev/null || echo "No mappings to report" >> artifacts-mac/placeholder.txt
108-
mv -n artifacts/* artifacts-mac/ || true;
109-
EXIT_CODE=$(cat TEST_EXIT_CODE);
110-
if [ $EXIT_CODE != 0 ]; then
111-
exit $EXIT_CODE;
112-
fi
113-
exit $SCRIPT_EXIT_CODE;
11495
- name: Upload artifacts
11596
if: ${{ always() && github.event_name == 'pull_request' }}
11697
uses: actions/upload-artifact@v4
@@ -167,25 +148,6 @@ jobs:
167148
exit $EXIT_CODE;
168149
fi
169150
exit $SCRIPT_EXIT_CODE;
170-
- name: Run Smoke Tests in Ubuntu (Headed)
171-
if: steps.setup.conclusion == 'success' && always()
172-
env:
173-
REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
174-
FX_EXECUTABLE: ./firefox/firefox
175-
run: |
176-
mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
177-
echo "0" > TEST_EXIT_CODE;
178-
while IFS= read -r line; do
179-
echo "Running tests for: $line";
180-
DISPLAY=:99 pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
181-
done < selected_l10n_mappings;
182-
ls artifacts-linux/* &>/dev/null || echo "No mappings to report" >> artifacts-linux/placeholder.txt
183-
mv -n artifacts/* artifacts-linux/ || true;
184-
EXIT_CODE=$(cat TEST_EXIT_CODE);
185-
if [ $EXIT_CODE != 0 ]; then
186-
exit $EXIT_CODE;
187-
fi
188-
exit $SCRIPT_EXIT_CODE;
189151
- name: Upload artifacts
190152
if: ${{ always() && inputs.is_pull_request == true }}
191153
uses: actions/upload-artifact@v4
@@ -277,47 +239,6 @@ jobs:
277239
exit [int]$EXIT_CODE
278240
}
279241
exit $env:SCRIPT_EXIT_CODE
280-
- name: Run L10N Tests in Win (Headed)
281-
if: steps.setup.conclusion == 'success' && always()
282-
env:
283-
REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
284-
run: |
285-
rm ./pyproject.toml;
286-
mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
287-
$env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
288-
Write-Host "FX_EXECUTABLE: $FX_EXECUTABLE"
289-
pipenv run python choose_l10n_ci_set.py
290-
"0" | Set-Content -Path "TEST_EXIT_CODE"
291-
$SCRIPT_EXIT_CODE = 0
292-
Get-Content "selected_l10n_mappings" | ForEach-Object {
293-
$line = $_
294-
Write-Host "Running tests for: $line"
295-
try {
296-
pipenv run python -m l10n_CM.run_l10n --fx-executable="$env:FX_EXECUTABLE" $line
297-
} catch {
298-
$SCRIPT_EXIT_CODE = $_.Exception.HResult
299-
}
300-
}
301-
rm artifacts/assets -r -Force -ErrorAction SilentlyContinue
302-
Get-ChildItem -Path "artifacts" -ErrorAction SilentlyContinue | ForEach-Object {
303-
$destPath = "artifacts-win\" + $_.Name
304-
if (-not (Test-Path -Path $destPath)) {
305-
try {
306-
Move-Item -Path $_.FullName -Destination $destPath
307-
} catch {
308-
# Ignore errors and continue
309-
}
310-
}
311-
}
312-
mkdir artifacts-win -Force
313-
if (-not (Test-Path -Path "artifacts-win\*")) {
314-
New-Item -Path "artifacts-win\placeholder.txt" -ItemType File -Value "no mappings to report."
315-
}
316-
$EXIT_CODE = Get-Content -Path "TEST_EXIT_CODE"
317-
if ($EXIT_CODE -ne 0) {
318-
exit [int]$EXIT_CODE
319-
}
320-
exit $env:SCRIPT_EXIT_CODE
321242
- name: Upload artifacts
322243
if: ${{ always() && inputs.is_pull_request == true }}
323244
uses: actions/upload-artifact@v4

‎Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pypom = "2.2.4"
1616
taskcluster-taskgraph = "==9.0.0"
1717
jsonpath-ng = "1.6.1"
1818
pillow = "<10.5"
19-
pyfxa = "0.7.0"
19+
pyfxa = "0.8.1"
2020
ruff = "0.9.6"
2121
pytest-rerunfailures = "14.0"
2222
slack-sdk = "3.31.0"

‎SELECTOR_INFO.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2042,6 +2042,34 @@ Location: In the FxA signin page flow
20422042
Path to .json: modules/data/fxa_home.components.json
20432043
```
20442044
```
2045+
Selector Name: do-it-later-button
2046+
Selector Data: "inline_recovery_key_setup_create_do_it_later"
2047+
Description: Coninute fxa account creation flow
2048+
Location: In the FxA signin page flow
2049+
Path to .json: modules/data/fxa_home.components.json
2050+
```
2051+
```
2052+
Selector Name: login-password-input
2053+
Selector Data: "choice-pair-not-now"
2054+
Description: Dont pair with phone now
2055+
Location: In the FxA signin page flow
2056+
Path to .json: modules/data/fxa_home.components.json
2057+
```
2058+
```
2059+
Selector Name: signed-in-status
2060+
Selector Data: "div[role='status']"
2061+
Description: Sign in status
2062+
Location: In the FxA signin page flow
2063+
Path to .json: modules/data/fxa_home.components.json
2064+
```
2065+
```
2066+
Selector Name: manage-sync-button
2067+
Selector Data: "signup_confirmed_sync_manage_sync_button"
2068+
Description: sign up and sync confirmation
2069+
Location: In the FxA signin page flow
2070+
Path to .json: modules/data/fxa_home.components.json
2071+
```
2072+
```
20452073
Selector Name: signin-otp-input
20462074
Selector Data: "[data-testid='signin-token-code-input-field']"
20472075
Description: The FxAccount One Time Password entry field
@@ -2994,7 +3022,7 @@ Path to .json: modules/data/navigation.components.json
29943022
```
29953023
```
29963024
Selector Name: searchmode-switcher-settings
2997-
Selector Data: searchmode-switcher-popup-search-settings-button
3025+
Selector Data: menuitem[data-l10n-id='urlbar-searchmode-popup-search-settings-menuitem']
29983026
Description: Search settings button in the searchmode switcher dropdown
29993027
Location: Address bar
30003028
Path to .json: modules/data/navigation.components.json

‎ci_l10n_pyproject_headed.toml

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎l10n_CM/Unified/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ def cc_site_data(live_site, region):
106106
@pytest.fixture
107107
def is_live_site(live_site, region):
108108
"""Determine if the site is live.
109-
Treat demo IT and ES as a live site until the doorhanger bug is fixed.
109+
Treat demo IT, ES and BE as a live site until the doorhanger bug is fixed.
110110
"""
111-
return live_site != "demo" or region in {"IT", "ES"}
111+
return live_site != "demo" or region in {"IT", "ES", "BE"}
112112

113113

114114
@pytest.fixture(scope="session")

‎l10n_CM/constants/amazon/US/amazon_ad.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
"bf3bb4bd-06fc-493b-a8d5-7c2c31db66cb",
1515
"543e09ec-34d0-4f72-846c-5ae35a323ba8",
1616
"33198fca-ddab-40a0-bc03-8b6f83bc3a98"
17-
],
18-
"skip_os": ["Linux"]
17+
]
1918
}

‎l10n_CM/constants/amazon/US/amazon_cc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@
1212
"4f630b6e-efd1-458d-9762-9a12a3dd28de",
1313
"6a5751ab-ccf2-48e3-89d8-ac9cb1fa1249",
1414
"041dc144-7c6d-4462-8155-948146e75a9a"
15-
],
16-
"skip_os": ["Linux"]
15+
]
1716
}

‎l10n_CM/constants/brico/BE/brico_ad.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"url": "http://127.0.0.1:8080/brico_ad.html",
3+
"field_mapping": {
4+
"given_name": "41c39dfe-af73-4124-800a-9c6b81cf019c",
5+
"family_name": "49f46362-b2b3-4370-b5a8-265a3e335219",
6+
"street_address": "bc2a2c3d-d581-4737-94e5-772e5092c997",
7+
"address_level_2": "e413d097-dc7c-4e54-88cc-b0d312f66225",
8+
"postal_code": "a24ae667-9e81-4b83-8e3e-98bb3d4bb994",
9+
"telephone": "2d34b8c9-0a43-49a4-89fc-a5b10f4641a0",
10+
"email": "d0ef33cf-b005-4e1b-9d96-97392c79ac89"
11+
},
12+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
13+
"fields": [
14+
"41c39dfe-af73-4124-800a-9c6b81cf019c",
15+
"49f46362-b2b3-4370-b5a8-265a3e335219",
16+
"bc2a2c3d-d581-4737-94e5-772e5092c997",
17+
"e413d097-dc7c-4e54-88cc-b0d312f66225",
18+
"a24ae667-9e81-4b83-8e3e-98bb3d4bb994",
19+
"2d34b8c9-0a43-49a4-89fc-a5b10f4641a0",
20+
"d0ef33cf-b005-4e1b-9d96-97392c79ac89"
21+
],
22+
"skipped": [
23+
"test_demo_ad_3a_autofill_address_fields.py",
24+
"test_demo_ad_3b_autofill_name_org_fields.py",
25+
"test_demo_ad_3c_autofill_phone_email_fields.py"
26+
]
27+
}

‎l10n_CM/constants/brico/BE/brico_cc.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"url": "http://127.0.0.1:8080/brico_cc.html",
3+
"field_mapping": {
4+
"card_number": "61ed6e91-e97e-4aa9-b18c-44a5b65a0da5",
5+
"name": "e306d4c8-b355-47d2-9f11-2bc03770c1c1",
6+
"expiration_month": "7dd0225f-9dde-450f-9789-6b1afeb79017",
7+
"expiration_year": "bfb596be-4108-4826-b54d-0a7f042fefeb",
8+
"cvv": "9790f8a4-1f21-4381-9ac8-f8123ad008a6"
9+
},
10+
11+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
12+
"fields": [
13+
"61ed6e91-e97e-4aa9-b18c-44a5b65a0da5",
14+
"e306d4c8-b355-47d2-9f11-2bc03770c1c1",
15+
"7dd0225f-9dde-450f-9789-6b1afeb79017",
16+
"bfb596be-4108-4826-b54d-0a7f042fefeb",
17+
"9790f8a4-1f21-4381-9ac8-f8123ad008a6"
18+
]
19+
}

‎l10n_CM/constants/douglas/BE/douglas_ad.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"url": "http://127.0.0.1:8080/douglas_ad.html",
3+
"field_mapping": {
4+
"given_name":"44b17868-63bd-4ad7-9054-8c97583dfbbd",
5+
"family_name":"91e11207-713f-433c-b26a-17f38c229b9f",
6+
"street_address":"8106df36-5490-473e-9274-e10703157bfc",
7+
"postal_code":"f10d15fe-7b8d-46e9-99fc-7c34b676d74b",
8+
"address_level_2": "18a599a1-7d6c-4a91-805c-c7f10c51b66c",
9+
"email": "151b57f4-881f-44e2-9404-b6c6242d6dba"
10+
},
11+
12+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
13+
"fields": [
14+
"44b17868-63bd-4ad7-9054-8c97583dfbbd",
15+
"91e11207-713f-433c-b26a-17f38c229b9f",
16+
"8106df36-5490-473e-9274-e10703157bfc",
17+
"f10d15fe-7b8d-46e9-99fc-7c34b676d74b",
18+
"18a599a1-7d6c-4a91-805c-c7f10c51b66c",
19+
"151b57f4-881f-44e2-9404-b6c6242d6dba"
20+
]
21+
}

0 commit comments

Comments
 (0)