additional object model changes

philimon-reset · philimon-reset · commit 73f887f79474 · 2025-04-09T16:09:20.000+02:00
diff --git a/l10n_CM/Unified/test_demo_ad_1a_dropdown_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_1a_dropdown_name_org_fields.py
@@ -30,6 +30,6 @@ def test_dropdown_presence_name_organization(
     # Verify that the name and organization fields have the autofill dropdown present
     fields_to_test = ["name", "organization"]
 
-    address_autofill.verify_autofill_dropdown_addresses(
+    address_autofill.verify_field_autofill_dropdown(
         region=region, fields_to_test=fields_to_test
     )
diff --git a/l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py b/l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py
@@ -35,6 +35,6 @@ def test_dropdown_presence_address_field(
         "country",
     ]
 
-    address_autofill.verify_autofill_dropdown_addresses(
+    address_autofill.verify_field_autofill_dropdown(
         region=region, fields_to_test=fields_to_test
     )
diff --git a/l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py
@@ -29,6 +29,6 @@ def test_dropdown_presence_email_phone_field(
 
     fields_to_test = ["email", "tel"]
 
-    address_autofill.verify_autofill_dropdown_addresses(
+    address_autofill.verify_field_autofill_dropdown(
         region=region, fields_to_test=fields_to_test
     )
diff --git a/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py
@@ -34,8 +34,8 @@ def test_address_yellow_highlight_on_name_organization_fields(
 
     field_to_test = ["name", "organization"]
     # Verify the name and organization fields are highlighted
-    address_autofill.verify_field_yellow_highlights(
-        region,
+    address_autofill.verify_field_highlight(
         fields_to_test=field_to_test,
         expected_highlighted_fields=field_to_test,
+        region=region,
     )
diff --git a/l10n_CM/Unified/test_demo_ad_4b_highlight_address_fields.py b/l10n_CM/Unified/test_demo_ad_4b_highlight_address_fields.py
@@ -41,6 +41,8 @@ def test_address_yellow_highlight_address_fields(
     ]
 
     # Verify the address fields are highlighted
-    address_autofill.verify_field_yellow_highlights(
-        region, fields_to_test=field_to_test, expected_highlighted_fields=field_to_test
+    address_autofill.verify_field_highlight(
+        fields_to_test=field_to_test,
+        expected_highlighted_fields=field_to_test,
+        region=region,
     )
diff --git a/l10n_CM/Unified/test_demo_ad_4c_highlight_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_4c_highlight_phone_email_fields.py
@@ -34,6 +34,8 @@ def test_address_yellow_highlight_address_fields(
 
     field_to_test = ["email", "tel"]
     # Verify the address fields are highlighted
-    address_autofill.verify_field_yellow_highlights(
-        region, fields_to_test=field_to_test, expected_highlighted_fields=field_to_test
+    address_autofill.verify_field_highlight(
+        fields_to_test=field_to_test,
+        expected_highlighted_fields=field_to_test,
+        region=region,
     )
diff --git a/l10n_CM/Unified/test_demo_ad_5a_clear_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_5a_clear_name_org_fields.py
@@ -30,4 +30,4 @@ def test_demo_ad_clear_name_org(
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.clear_and_verify(field, address_autofill_data)
+        address_autofill.clear_and_verify(field, region)
diff --git a/l10n_CM/Unified/test_demo_ad_5b_clear_address_fields.py b/l10n_CM/Unified/test_demo_ad_5b_clear_address_fields.py
@@ -36,4 +36,4 @@ def test_demo_ad_clear_address_fields(
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.clear_and_verify(field, address_autofill_data)
+        address_autofill.clear_and_verify(field, region)
diff --git a/l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py
@@ -30,4 +30,4 @@ def test_demo_ad_clear_tel_email(
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.clear_and_verify(field, address_autofill_data)
+        address_autofill.clear_and_verify(field, region)
diff --git a/l10n_CM/Unified/test_demo_cc_1_dropdown.py b/l10n_CM/Unified/test_demo_cc_1_dropdown.py
@@ -38,4 +38,4 @@ def test_dropdown_presence_credit_card(
     credit_card_fill_obj.open()
 
     # Verify autofill dropdown is displayed only for the eligible fields
-    credit_card_fill_obj.verify_autofill_dropdown_credit_card()
+    credit_card_fill_obj.verify_field_autofill_dropdown()
diff --git a/l10n_CM/Unified/test_demo_cc_2_preview.py b/l10n_CM/Unified/test_demo_cc_2_preview.py
@@ -45,7 +45,7 @@ def test_cc_preview(
     # Hover over each field and check data preview
     fields_to_test = ["cc-name", "cc-number", "cc-exp-month", "cc-exp-year"]
     for field in fields_to_test:
-        credit_card_fill_obj.check_cc_autofill_preview_for_field(
+        credit_card_fill_obj.check_autofill_preview_for_field(
             field, credit_card_sample_data
         )
 
diff --git a/l10n_CM/Unified/test_demo_cc_5_clear.py b/l10n_CM/Unified/test_demo_cc_5_clear.py
@@ -38,4 +38,5 @@ def test_cc_clear_form(
 
     # Open credit card form page, clear form and verify all fields are empty
     credit_card_fill_obj.open()
-    credit_card_fill_obj.verify_clear_form_all_fields()
+    for field in credit_card_fill_obj.fields:
+        credit_card_fill_obj.clear_and_verify(field, region)
diff --git a/modules/page_object_autofill.py b/modules/page_object_autofill.py
diff --git a/tests/form_autofill/test_autofill_credit_card_four_fields.py b/tests/form_autofill/test_autofill_credit_card_four_fields.py
diff --git a/tests/form_autofill/test_cc_clear_form.py b/tests/form_autofill/test_cc_clear_form.py
diff --git a/tests/form_autofill/test_form_autofill_suggestions.py b/tests/form_autofill/test_form_autofill_suggestions.py
diff --git a/tests/form_autofill/test_updating_address.py b/tests/form_autofill/test_updating_address.py
diff --git a/tests/password_manager/test_multiple_saved_logins.py b/tests/password_manager/test_multiple_saved_logins.py

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ def test_dropdown_presence_name_organization(`
`30`	`30`	`# Verify that the name and organization fields have the autofill dropdown present`
`31`	`31`	`fields_to_test = ["name", "organization"]`
`32`	`32`
`33`		`- address_autofill.verify_autofill_dropdown_addresses(`
	`33`	`+ address_autofill.verify_field_autofill_dropdown(`
`34`	`34`	`region=region, fields_to_test=fields_to_test`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ def test_dropdown_presence_address_field(`
`35`	`35`	`"country",`
`36`	`36`	`]`
`37`	`37`
`38`		`- address_autofill.verify_autofill_dropdown_addresses(`
	`38`	`+ address_autofill.verify_field_autofill_dropdown(`
`39`	`39`	`region=region, fields_to_test=fields_to_test`
`40`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ def test_dropdown_presence_email_phone_field(`
`29`	`29`
`30`	`30`	`fields_to_test = ["email", "tel"]`
`31`	`31`
`32`		`- address_autofill.verify_autofill_dropdown_addresses(`
	`32`	`+ address_autofill.verify_field_autofill_dropdown(`
`33`	`33`	`region=region, fields_to_test=fields_to_test`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ def test_address_yellow_highlight_address_fields(`
`41`	`41`	`]`
`42`	`42`
`43`	`43`	`# Verify the address fields are highlighted`
`44`		`- address_autofill.verify_field_yellow_highlights(`
`45`		`- region, fields_to_test=field_to_test, expected_highlighted_fields=field_to_test`
	`44`	`+ address_autofill.verify_field_highlight(`
	`45`	`+ fields_to_test=field_to_test,`
	`46`	`+ expected_highlighted_fields=field_to_test,`
	`47`	`+ region=region,`
`46`	`48`	`)`