addressfill methods moved to autofill except one

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -58,5 +58,5 @@ def about_prefs(driver):
 
 
 @pytest.fixture()
-def credit_card_fill_obj(driver):
+def credit_card_autofill(driver):
     yield CreditCardFill(driver)

l10n_CM/Unified/test_demo_ad_3a_autofill_address_fields.py

@@ -36,4 +36,4 @@ def test_demo_ad_autofill_address_fields(
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.autofill_and_verify(field, address_autofill_data)
+        address_autofill.clear_and_verify(field, address_autofill_data)

l10n_CM/Unified/test_demo_ad_3b_autofill_name_org_fields.py

@@ -30,4 +30,4 @@ def test_demo_ad_autofill_name_org(
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.autofill_and_verify(field, address_autofill_data)
+        address_autofill.clear_and_verify(field, address_autofill_data)

l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py

@@ -30,4 +30,4 @@ def test_demo_ad_autofill_phone_email(
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.autofill_and_verify(field, address_autofill_data)
+        address_autofill.clear_and_verify(field, address_autofill_data)

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, region)
+        address_autofill.clear_and_verify(field, region=region)

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, region)
+        address_autofill.clear_and_verify(field, region=region)

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, region)
+        address_autofill.clear_and_verify(field, region=region)

l10n_CM/Unified/test_demo_cc_1_dropdown.py

@@ -17,7 +17,7 @@ def test_dropdown_presence_credit_card(
     util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
-    credit_card_fill_obj: CreditCardFill,
+    credit_card_autofill: CreditCardFill,
 ):
     """
     C2886598 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
@@ -35,7 +35,7 @@ def test_dropdown_presence_credit_card(
     about_prefs_privacy.add_entry_to_saved_payments(credit_card_sample_data)
 
     # Open credit card form page
-    credit_card_fill_obj.open()
+    credit_card_autofill.open()
 
     # Verify autofill dropdown is displayed only for the eligible fields
-    credit_card_fill_obj.verify_field_autofill_dropdown()
+    credit_card_autofill.verify_field_autofill_dropdown()

l10n_CM/Unified/test_demo_cc_2_preview.py

@@ -22,7 +22,7 @@ def test_cc_preview(
     region: str,
     about_prefs_privacy: AboutPrefs,
     autofill_popup: AutofillPopup,
-    credit_card_fill_obj: CreditCardFill,
+    credit_card_autofill: CreditCardFill,
 ):
     """
     C2886599 -  Verify that hovering over field will preview all eligible fields (except for the CVV field)
@@ -40,14 +40,14 @@ def test_cc_preview(
     about_prefs_privacy.add_entry_to_saved_payments(credit_card_sample_data)
 
     # Open credit card form page
-    credit_card_fill_obj.open()
+    credit_card_autofill.open()
 
     # 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_autofill_preview_for_field(
+        credit_card_autofill.check_autofill_preview_for_field(
             field, credit_card_sample_data
         )
 
-    credit_card_fill_obj.click_on("form-field", labels=["cc-csc"])
+    credit_card_autofill.click_on("form-field", labels=["cc-csc"])
     autofill_popup.ensure_autofill_dropdown_not_visible()

l10n_CM/Unified/test_demo_cc_3_autofill.py

@@ -15,22 +15,28 @@ def test_cc_autofill_from_dropdown(
     driver: Firefox,
     util: Utilities,
     autofill_popup: AutofillPopup,
-    credit_card_fill_obj: CreditCardFill,
+    credit_card_autofill: CreditCardFill,
+    region: str,
 ):
     """
     Verify that saved credit card information is autofilled correctly when selected from the dropdown,
     except for the CVV field.
+    Arguments:
+        credit_card_autofill: CreditCardFill instance
+        autofill_popup: AutofillPopup instance
+        util: Utilities instance
+        region: region being tested
     """
 
     # Open credit card form page
-    credit_card_fill_obj.open()
+    credit_card_autofill.open()
 
     # Create and save fake credit card data
-    credit_card_data = credit_card_fill_obj.fill_and_save()
+    credit_card_data = credit_card_autofill.fill_and_save(region)
 
     # Autocomplete and clear all fields
-    credit_card_fill_obj.autofill_and_clear_all_fields(credit_card_data)
+    credit_card_autofill.clear_and_verify_all_fields(credit_card_data, region)
 
     # Step 5: Click the csc field (cc-csc), ensure autofill popup is not present
-    credit_card_fill_obj.click_on("form-field", labels=["cc-csc"])  # Use single click
+    credit_card_autofill.click_on("form-field", labels=["cc-csc"])  # Use single click
     autofill_popup.ensure_autofill_dropdown_not_visible()