Skip to content

Commit 73c8008

Browse files
ruhankianiruhankiani
authored
Merge branch 'mozilla:main' into test/test_reload_overiding_cache_keys
2 parents 88ba17f + b3cb826 commit 73c8008

File tree

114 files changed

+2955
-97
lines changed

Some content is hidden

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

114 files changed

+2955
-97
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
/.vscode/
22
/venv/
33
.env
44
.report.json

‎SELECTOR_INFO.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,13 @@ Location: Toolbar - any bookmark context menu
17751775
Path to .json: modules/data/context_menu.components.json
17761776
```
17771777
```
1778+
Selector Name: context-menu-toolbar-open-in-new-tab
1779+
Selector Data: selectorData": "placesContext_open:newtab"
1780+
Description: Context menu option from a Toolbar bookmark
1781+
Location: Toolbar - any bookmark context menu
1782+
Path to .json: modules/data/context_menu.components.json
1783+
```
1784+
```
17781785
Selector Name: context-menu-toolbar-open-all-bookmarks
17791786
Selector Data: placesContext_openBookmarkContainer:tabs
17801787
Description: Open all bookmarks from the context menu option from a Toolbar bookmark

‎choose_l10n_beta_split.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ def distribute_mappings_evenly(mappings):
2424
min_idx = loads.index(min(loads))
2525
balanced_splits[min_idx][site] = list(regions)
2626
loads[min_idx] += len(regions)
27+
for i in range(len(balanced_splits)):
28+
logging.info(f"Beta split: {i}")
29+
current_split = [
30+
f"{site} {' '.join(regions)}"
31+
for site, regions in balanced_splits[i].items()
32+
]
33+
logging.info(f"{'\n'.join(current_split)}")
2734
return balanced_splits
2835

2936

‎choose_l10n_ci_set.py‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,26 @@ def valid_l10n_mappings():
3030
region_file = json.load(f)
3131
if region_file.get("sites"):
3232
for site in region_file.get("sites"):
33-
mapping[site].add(region)
33+
report_mapping = True
34+
if site != "demo" and os.path.exists(
35+
f"./l10n_CM/constants/{site}/{region}"
36+
):
37+
with (
38+
open(
39+
f"./l10n_CM/constants/{site}/{region}/{site}_ad.json",
40+
"r+",
41+
) as ad_file,
42+
open(
43+
f"./l10n_CM/constants/{site}/{region}/{site}_cc.json",
44+
"r+",
45+
) as cc_file,
46+
):
47+
ad = json.load(ad_file)
48+
cc = json.load(cc_file)
49+
if ad.get("skip") and cc.get("skip"):
50+
report_mapping = False
51+
if report_mapping:
52+
mapping[site].add(region)
3453
return mapping
3554

3655

‎l10n_CM/constants/boohoo/CA/boohoo_ad.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"url": "http://127.0.0.1:8080/boohoo_ad.html",
3+
"field_mapping": {
4+
"given_name": "441ca8be-1b86-4720-92b8-cc0d846fca70",
5+
"family_name": "48013fb6-65f1-45f3-aa42-59f2a060e85b",
6+
"country": "c1be6cd3-3c70-425b-a2e7-3e30bb16edb9",
7+
"street_address": "ddb1ad68-71b4-4e28-b689-b6ae257c5640",
8+
"address_level_2": "4d0d74e4-08a8-475b-b3e3-4dc0803f97cf",
9+
"address_level_1": "60c6aeb4-16ea-4947-a4e6-5b6819fc5405",
10+
"postal_code": "fdbcc179-452d-421f-8dad-6ae803605ee5",
11+
"telephone": "2a1f2fbb-ba51-4ad9-b585-0deb23e42c2d"
12+
},
13+
14+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
15+
"fields": [
16+
"441ca8be-1b86-4720-92b8-cc0d846fca70",
17+
"48013fb6-65f1-45f3-aa42-59f2a060e85b",
18+
"c1be6cd3-3c70-425b-a2e7-3e30bb16edb9",
19+
"ddb1ad68-71b4-4e28-b689-b6ae257c5640",
20+
"4d0d74e4-08a8-475b-b3e3-4dc0803f97cf",
21+
"60c6aeb4-16ea-4947-a4e6-5b6819fc5405",
22+
"fdbcc179-452d-421f-8dad-6ae803605ee5",
23+
"2a1f2fbb-ba51-4ad9-b585-0deb23e42c2d"
24+
]
25+
}

‎l10n_CM/constants/boohoo/CA/boohoo_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/boohoo_cc.html",
3+
"field_mapping": {
4+
"card_number": "6cba999f-33f7-4e06-bb43-3e8985931de6",
5+
"name": "ea44442f-c2a3-4bf2-8e97-ed61356add36",
6+
"expiration_month": "7265bd2f-9433-4ca8-9c83-a88ef69abf60",
7+
"expiration_year": "90fad733-c684-4cc9-98fb-c93833f30fd3",
8+
"cvv": "3087fbe0-b452-4836-a9e8-4b9e603c41f2"
9+
},
10+
11+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
12+
"fields": [
13+
"6cba999f-33f7-4e06-bb43-3e8985931de6",
14+
"ea44442f-c2a3-4bf2-8e97-ed61356add36",
15+
"7265bd2f-9433-4ca8-9c83-a88ef69abf60",
16+
"90fad733-c684-4cc9-98fb-c93833f30fd3",
17+
"3087fbe0-b452-4836-a9e8-4b9e603c41f2"
18+
]
19+
}

‎l10n_CM/constants/canda/DE/canda_ad.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"url": "http://127.0.0.1:8080/canda_ad.html",
3+
"field_mapping": {
4+
"given_name": "f85b6e2e-05e1-4b7d-835a-957a238f7feb",
5+
"family_name": "bd52a237-af0a-42a1-be09-1d11508cfb53",
6+
"address_level_2": "e5f3f245-fa1d-4450-8c56-c9b9651d0477",
7+
"street_address" : "9aa878a1-6648-475d-9b0a-17096686a42d",
8+
"postal_code": "934fb524-bb16-49b1-a096-32b70b505945",
9+
"telephone": "947c5164-f2d6-42b7-85cf-15166f1ff764",
10+
"email": "45ee78f0-baf5-44de-a996-50e060cca00f"
11+
},
12+
13+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
14+
"fields": [
15+
"f85b6e2e-05e1-4b7d-835a-957a238f7feb",
16+
"bd52a237-af0a-42a1-be09-1d11508cfb53",
17+
"e5f3f245-fa1d-4450-8c56-c9b9651d0477",
18+
"9aa878a1-6648-475d-9b0a-17096686a42d",
19+
"934fb524-bb16-49b1-a096-32b70b505945",
20+
"947c5164-f2d6-42b7-85cf-15166f1ff764",
21+
"45ee78f0-baf5-44de-a996-50e060cca00f"
22+
]
23+
}

‎l10n_CM/constants/canda/DE/canda_cc.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"url": "http://127.0.0.1:8080/canda_cc.html",
3+
"field_mapping": {
4+
"card_number": "c77a5f60-a2f2-46a1-92d7-cd4b43c8f384",
5+
"expiration_date": "65587e02-a8bc-4fa7-87b9-6775f95acf4f",
6+
"cvv": "659a8eaa-e4f3-4ff2-83ea-c89e92e163f8",
7+
"name": "2a32fed3-1e2e-48e0-9ade-599dd505cc5d"
8+
},
9+
10+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
11+
"fields": [
12+
"c77a5f60-a2f2-46a1-92d7-cd4b43c8f384",
13+
"65587e02-a8bc-4fa7-87b9-6775f95acf4f",
14+
"659a8eaa-e4f3-4ff2-83ea-c89e92e163f8",
15+
"2a32fed3-1e2e-48e0-9ade-599dd505cc5d"
16+
],
17+
18+
"skipped": [
19+
"test_demo_ad_3a_autofill_address_fields.py",
20+
"test_demo_ad_3b_autofill_name_org_fields.py",
21+
"test_demo_ad_3c_autofill_phone_email_fields.py"
22+
]
23+
}

‎l10n_CM/constants/cupshe/CA/cupshe_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/cupshe_ad.html",
3+
"field_mapping": {
4+
"given_name":"bdbfa5cc-0a65-436b-8029-2915feeacd3f",
5+
"family_name":"4a452ab0-598b-4bc3-87eb-04aad2178a74",
6+
"street_address":"ca64bf31-31d8-4855-a1c1-3528f6e64ea4",
7+
"postal_code":"0347bc97-e89c-4c02-a969-c12e7059e2e1",
8+
"address_level_2": "8149b53c-22ab-4150-8e72-8e612601a6ef",
9+
"telephone": "82a9ad4c-951c-427c-bfca-a24a957a6865"
10+
},
11+
12+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
13+
"fields": [
14+
"bdbfa5cc-0a65-436b-8029-2915feeacd3f",
15+
"4a452ab0-598b-4bc3-87eb-04aad2178a74",
16+
"ca64bf31-31d8-4855-a1c1-3528f6e64ea4",
17+
"0347bc97-e89c-4c02-a969-c12e7059e2e1",
18+
"8149b53c-22ab-4150-8e72-8e612601a6ef",
19+
"82a9ad4c-951c-427c-bfca-a24a957a6865"
20+
]
21+
}

‎l10n_CM/constants/cupshe/CA/cupshe_cc.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"url": "http://127.0.0.1:8080/cupshe_cc.html",
3+
"field_mapping": {
4+
"name": "aab79622-29d5-45c1-b06e-4a5a166e3664",
5+
"card_number": "b439d02d-365f-4568-8cb6-a93136e42100",
6+
"expiration_date": "2819550d-324a-42a1-96ac-66db21c0c8a3",
7+
"cvv": "af6ace23-3c90-4a8d-949b-7e5ed81a73fb"
8+
},
9+
10+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
11+
"fields": [
12+
"aab79622-29d5-45c1-b06e-4a5a166e3664",
13+
"b439d02d-365f-4568-8cb6-a93136e42100",
14+
"2819550d-324a-42a1-96ac-66db21c0c8a3",
15+
"af6ace23-3c90-4a8d-949b-7e5ed81a73fb"
16+
]
17+
}

0 commit comments

Comments
 (0)