Skip to content

Commit 2e8895a

Browse files
authored
Merge pull request #622 from mozilla/as/cm-lowes-us
Anca/ L10n [US] - Lowes (ad+cc)
2 parents 266d401 + 0b68eb8 commit 2e8895a

File tree

7 files changed

+72
-27
lines changed

7 files changed

+72
-27
lines changed
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/lowes_ad.html",
3+
"field_mapping": {
4+
"given_name":"4b1e90aa-9614-4c10-9a07-e1f5d0d0fa5e",
5+
"family_name":"eda01517-1593-4907-bd89-e760ac1b3301",
6+
"street_address":"24128044-0f39-4679-93f1-788031618aa1",
7+
"address_level_2":"35740687-1404-4d7c-973e-4f4a8d49fd2c",
8+
"postal_code":"68980560-b0a3-4c07-b4a9-5bbf800cfc5d"
9+
10+
},
11+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
12+
"fields": [
13+
"4b1e90aa-9614-4c10-9a07-e1f5d0d0fa5e",
14+
"eda01517-1593-4907-bd89-e760ac1b3301",
15+
"24128044-0f39-4679-93f1-788031618aa1",
16+
"35740687-1404-4d7c-973e-4f4a8d49fd2c",
17+
"68980560-b0a3-4c07-b4a9-5bbf800cfc5d"
18+
]
19+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"url": "http://127.0.0.1:8080/lowes_cc.html",
3+
"field_mapping": {
4+
"card_number": "311621a3-d8f9-4dd3-bf9d-1eeb08f7f8a5",
5+
"expiration_date": "4ef6a37d-b02f-4fa7-bfc1-0994180238c8",
6+
"cvv": "78daaaff-d49c-4a2e-91a7-9cc214224f72"
7+
},
8+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
9+
"fields": [
10+
"311621a3-d8f9-4dd3-bf9d-1eeb08f7f8a5",
11+
"4ef6a37d-b02f-4fa7-bfc1-0994180238c8",
12+
"78daaaff-d49c-4a2e-91a7-9cc214224f72"
13+
]
14+
}

l10n_CM/run_l10n.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
valid_flags = {"--run-headless", "-n", "--reruns", "--fx-executable", "--ci"}
1414
flag_with_parameter = {"-n", "--reruns"}
1515
valid_region = {"US", "CA", "DE", "FR"}
16-
valid_sites = {"demo", "amazon", "walmart", "mediamarkt"}
16+
valid_sites = {"demo", "amazon", "walmart", "mediamarkt", "lowes"}
1717
live_sites = []
1818

1919
LOCALHOST = "127.0.0.1"

l10n_CM/sites/lowes/US/lowes_ad.html

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

l10n_CM/sites/lowes/US/lowes_cc.html

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

modules/page_object_autofill.py

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -225,28 +225,26 @@ def verify_form_data(self, sample_data: CreditCardBase | AutofillAddressBase):
225225
for attr_name, field_name in self.field_mapping.items():
226226
if non_us_ca_address and field_name == "address-level1":
227227
continue
228-
if field_name != "cc-csc":
229-
expected_value = getattr(sample_data, attr_name, None)
230-
autofilled_field = self.get_element("form-field", labels=[field_name])
231-
if autofilled_field.tag_name.lower() != "select":
232-
autofilled_field_value = autofilled_field.get_attribute("value")
233-
# self.expect_element_attribute_contains(
234-
# "form-field", "value", expected_value, labels=[field_name]
235-
# )
236-
else:
237-
autofilled_field_value = Select(
238-
autofilled_field
239-
).first_selected_option.text
240-
if (
241-
field_name == "address-level1"
242-
and autofilled_field_value != expected_value
243-
):
244-
expected_value = self.util.get_state_province_abbreviation(
245-
expected_value
246-
)
247-
assert expected_value in autofilled_field_value, (
248-
f"{autofilled_field_value} is different from {expected_value}"
228+
if attr_name == "cvv":
229+
continue
230+
expected_value = getattr(sample_data, attr_name, None)
231+
autofilled_field = self.get_element("form-field", labels=[field_name])
232+
if autofilled_field.tag_name.lower() != "select":
233+
autofilled_field_value = autofilled_field.get_attribute("value")
234+
else:
235+
autofilled_field_value = Select(
236+
autofilled_field
237+
).first_selected_option.text
238+
if (
239+
field_name == "address-level1"
240+
and autofilled_field_value != expected_value
241+
):
242+
expected_value = self.util.get_state_province_abbreviation(
243+
expected_value
249244
)
245+
assert expected_value in autofilled_field_value, (
246+
f"{autofilled_field_value} is different from {expected_value}"
247+
)
250248

251249
def verify_field_autofill_dropdown(
252250
self,

modules/testrail_scripts/testrail_script_set_all_subs_to_functional.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import logging
2+
23
from dotenv import load_dotenv
4+
35
from modules.testrail_integration import testrail_init
46

57
# Load environment variables from .env file
@@ -31,7 +33,9 @@ def get_all_cases_from_suite(tr, project_id, suite_id):
3133

3234
while True:
3335
# Build the API endpoint with pagination parameters
34-
endpoint = f"get_cases/{project_id}&suite_id={suite_id}&limit={limit}&offset={offset}"
36+
endpoint = (
37+
f"get_cases/{project_id}&suite_id={suite_id}&limit={limit}&offset={offset}"
38+
)
3539
response = tr.client.send_get(endpoint) # Send API request to TestRail
3640
cases = response.get("cases", []) # Extract the list of test cases
3741

@@ -86,13 +90,21 @@ def get_all_cases_from_suite(tr, project_id, suite_id):
8690

8791
if not DRY_RUN:
8892
# If not in dry run mode, perform the update
89-
result = tr.update_case_field(case["id"], "custom_sub_test_suites", CUSTOM_SUB_TEST_SUITES)
90-
logging.info(f"Updated case {case['id']} to '{CUSTOM_SUB_TEST_SUITES}', Result: {result}")
93+
result = tr.update_case_field(
94+
case["id"], "custom_sub_test_suites", CUSTOM_SUB_TEST_SUITES
95+
)
96+
logging.info(
97+
f"Updated case {case['id']} to '{CUSTOM_SUB_TEST_SUITES}', Result: {result}"
98+
)
9199
else:
92100
# In dry run mode, just log the intended change without making it
93-
logging.info(f"[DRY RUN] Would update case {case['id']} from '{current_value}' to '{CUSTOM_SUB_TEST_SUITES}'.")
101+
logging.info(
102+
f"[DRY RUN] Would update case {case['id']} from '{current_value}' to '{CUSTOM_SUB_TEST_SUITES}'."
103+
)
94104

95105
updated_count += 1 # Increment the updated count
96106

97107
# Log the total number of cases updated or to be updated
98-
logging.info(f"Total cases {'updated' if not DRY_RUN else 'to be updated'}: {updated_count}")
108+
logging.info(
109+
f"Total cases {'updated' if not DRY_RUN else 'to be updated'}: {updated_count}"
110+
)

0 commit comments

Comments
 (0)