Skip to content

Commit 7d60604

Browse files
committed
CM l10n - [CA] newbancance
1 parent 4af091f commit 7d60604

File tree

4 files changed

+79
-55
lines changed

4 files changed

+79
-55
lines changed

l10n_CM/constants/calvinklein/US/calvinklein_ad.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
},
1313

1414
"form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
15+
"skip": "True",
1516
"fields": [
1617
"5d2af5cb-8f6d-4fdc-8ae5-21c7e5e97a43",
1718
"82900c67-963c-40f8-b0ef-c986a2accc43",
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"url": "http://127.0.0.1:8080/newbalance_ad.html",
3+
"field_mapping": {
4+
"given_name": "49ae6db7-0ef0-4988-9ee4-36dc1ccbc896",
5+
"family_name": "871f6f8f-7739-4e23-978a-e4d914aa62ff",
6+
"street_address": "03fca4b9-5203-45c8-ac5c-7d7c316594f3",
7+
"address_level_2": "2ef994d8-10fd-4b1e-a856-c0a4ac31e1e1",
8+
"address_level_1": "e190fe74-a903-4a86-9740-f51ac7052049",
9+
"postal_code": "ac50e99f-2f9c-41ae-b67c-bd188bddbe68",
10+
"email": "d7d64b41-de70-4b00-9890-c21b5ffb4ead",
11+
"telephone": "7ef64ccb-d18f-4c24-8228-3b98fe7812cc"
12+
},
13+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
14+
"fields": [
15+
"49ae6db7-0ef0-4988-9ee4-36dc1ccbc896",
16+
"871f6f8f-7739-4e23-978a-e4d914aa62ff",
17+
"03fca4b9-5203-45c8-ac5c-7d7c316594f3",
18+
"2ef994d8-10fd-4b1e-a856-c0a4ac31e1e1",
19+
"e190fe74-a903-4a86-9740-f51ac7052049",
20+
"ac50e99f-2f9c-41ae-b67c-bd188bddbe68",
21+
"d7d64b41-de70-4b00-9890-c21b5ffb4ead",
22+
"7ef64ccb-d18f-4c24-8228-3b98fe7812cc"
23+
]
24+
}

l10n_CM/run_l10n.py

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ def run_tests(reg, site, flg, all_tests):
9494
flg (list[str]): The list of pytest flags to be used.
9595
all_tests (list[str]): The list of test file paths to execute.
9696
"""
97-
all_tests = remove_skipped_tests(all_tests, site, reg)
9897
try:
9998
if len(all_tests) > 0:
10099
logging.info(f"Tests for {reg} region on {site} page.")
@@ -134,59 +133,6 @@ def get_region_tests(test_region: str) -> list[str]:
134133
)
135134

136135

137-
def remove_skipped_tests(extracted_tests, live_site, reg):
138-
"""
139-
Reads the mapping for the given region and site and removes any tests that are marked as skipped.
140-
141-
Args:
142-
extracted_tests (list[str]): The list of test file paths to execute.
143-
live_site (str): Page being tested.
144-
reg (str): The test region identifier.
145-
Returns:
146-
list[str]: A list of test file paths for the given region.
147-
"""
148-
mid_path = f"/{reg}/" if live_site != "demo" else "/"
149-
live_sites = [
150-
(f"{live_site}{mid_path}{live_site}_{suffix}", f"_{suffix}_")
151-
for suffix in ("ad", "cc")
152-
]
153-
for live_site, suffix in live_sites:
154-
skipped_tests = get_skipped_tests(live_site)
155-
if skipped_tests and skipped_tests != "All":
156-
skipped_tests = list(
157-
map(
158-
lambda test: os.path.join(current_dir, "Unified", test),
159-
skipped_tests,
160-
)
161-
)
162-
163-
def should_keep_test(test):
164-
return (
165-
suffix not in test
166-
if skipped_tests == "All"
167-
else test not in skipped_tests
168-
)
169-
170-
extracted_tests = list(filter(should_keep_test, extracted_tests))
171-
return extracted_tests
172-
173-
174-
def get_skipped_tests(live_site) -> list[str] | str:
175-
"""
176-
Read the mapping for the given region and site and return any tests that are marked as skipped.
177-
178-
Arg:
179-
live_site (str): The site is being tested.
180-
Returns:
181-
list[str] | str: A list of tests that should be skipped, or "All" if all tests should be skipped.
182-
"""
183-
with open(current_dir + "/constants/" + live_site + ".json", "r") as fp:
184-
live_site_data = load(fp)
185-
if live_site_data.get("skip"):
186-
return "All"
187-
return live_site_data.get("skipped", [])
188-
189-
190136
def get_flags_and_sanitize(flags_arguments: list[str]) -> list[str]:
191137
"""
192138
Extract and validate pytest flags from command-line arguments.
@@ -204,7 +150,7 @@ def get_flags_and_sanitize(flags_arguments: list[str]) -> list[str]:
204150
# add workers and rerun flaky failed tests.
205151
flg = []
206152
expanded_args = [
207-
flag.split() if "--" not in flag else [flag] for flag in flags_arguments
153+
flag.split() if " " in flag else [flag] for flag in flags_arguments
208154
]
209155
flags_arguments[:] = sum(expanded_args, [])
210156
for arg in flags_arguments[:]:

l10n_CM/sites/newbalance/CA/newbalance_ad.html

Lines changed: 53 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)