Merge pull request #554 from mozilla/philimon/autofill_refactor_#2

Philimon/autofill refactor #2

Author: philimon-reset

SELECTOR_INFO.md

@@ -1383,7 +1383,7 @@ Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
 Selector Name: doorhanger-save-button
-Selector Data: button[label='Save'].popup-notification-primary-button
+Selector Data: button[label^='Save'].popup-notification-primary-button
 Description: The "Save" button 
 Location: Inside the autofill save doorhangers (address and credit card) that is triggered in navigation bar
 Path to .json: modules/data/autofill_popup.components.json
@@ -1418,7 +1418,7 @@ Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
 Selector Name: doorhanger-update-button
-Selector Data: "button[label='Update']"
+Selector Data: "button[label^='Update']"
 Description: The "Update" button 
 Location: Inside the autofill save addreses doorhanger that is triggered in navigation bar
 Path to .json: modules/data/autofill_popup.components.json

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_1a_dropdown_name_org_fields.py

@@ -25,11 +25,11 @@ def test_dropdown_presence_name_organization(
 
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill.fill_and_save(util, autofill_popup, region)
+    address_autofill.fill_and_save(region)
 
     # Verify that the name and organization fields have the autofill dropdown present
     fields_to_test = ["name", "organization"]
 
-    address_autofill.verify_autofill_dropdown_addresses(
-        autofill_popup=autofill_popup, fields_to_test=fields_to_test, region=region
+    address_autofill.verify_field_autofill_dropdown(
+        region=region, fields_to_test=fields_to_test
     )

l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py

@@ -25,7 +25,7 @@ def test_dropdown_presence_address_field(
 
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill.fill_and_save(util, autofill_popup, region)
+    address_autofill.fill_and_save(region)
 
     fields_to_test = [
         "street-address",
@@ -35,6 +35,6 @@ def test_dropdown_presence_address_field(
         "country",
     ]
 
-    address_autofill.verify_autofill_dropdown_addresses(
-        autofill_popup=autofill_popup, fields_to_test=fields_to_test, region=region
+    address_autofill.verify_field_autofill_dropdown(
+        region=region, fields_to_test=fields_to_test
     )

l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py

@@ -25,10 +25,10 @@ def test_dropdown_presence_email_phone_field(
 
     # Open autofill page and fill fake data
     address_autofill.open()
-    address_autofill.fill_and_save(util, autofill_popup, region)
+    address_autofill.fill_and_save(region)
 
     fields_to_test = ["email", "tel"]
 
-    address_autofill.verify_autofill_dropdown_addresses(
-        autofill_popup=autofill_popup, fields_to_test=fields_to_test, region=region
+    address_autofill.verify_field_autofill_dropdown(
+        region=region, fields_to_test=fields_to_test
     )

l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py

@@ -23,11 +23,9 @@ def test_demo_ad_hover_name_org(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
+    autofill_data = address_autofill.fill_and_save(region)
 
     # Hover over each field and check data preview
     fields_to_test = ["name", "organization"]
     for field in fields_to_test:
-        address_autofill.check_autofill_preview_for_field(
-            field, autofill_data, autofill_popup, util, region
-        )
+        address_autofill.check_autofill_preview_for_field(field, autofill_data, region)

l10n_CM/Unified/test_demo_ad_2b_preview_address_fields.py

@@ -33,7 +33,7 @@ def test_hover_address_is_previewed(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
+    autofill_data = address_autofill.fill_and_save(region)
 
     # Hover over each field and check data preview
     fields_to_test = [
@@ -44,6 +44,4 @@ def test_hover_address_is_previewed(
         "country",
     ]
     for field in fields_to_test:
-        address_autofill.check_autofill_preview_for_field(
-            field, autofill_data, autofill_popup, util, region
-        )
+        address_autofill.check_autofill_preview_for_field(field, autofill_data, region)

l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py

@@ -22,11 +22,9 @@ def test_hover_email_and_phone_autofill_preview(
 ):
     # Create fake data and fill it in
     address_autofill.open()
-    autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
+    autofill_data = address_autofill.fill_and_save(region)
 
     # Hover over each field and check data preview
     fields_to_test = ["email", "tel"]
     for field in fields_to_test:
-        address_autofill.check_autofill_preview_for_field(
-            field, autofill_data, autofill_popup, util, region
-        )
+        address_autofill.check_autofill_preview_for_field(field, autofill_data, region)

l10n_CM/Unified/test_demo_ad_3a_autofill_address_fields.py

@@ -23,7 +23,7 @@ def test_demo_ad_autofill_address_fields(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
+    address_autofill_data = address_autofill.fill_and_save(region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = [
@@ -36,6 +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(
-            autofill_popup, field, address_autofill_data, util
-        )
+        address_autofill.clear_and_verify(field, address_autofill_data, region=region)

l10n_CM/Unified/test_demo_ad_3b_autofill_name_org_fields.py

@@ -23,13 +23,11 @@ def test_demo_ad_autofill_name_org(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
+    address_autofill_data = address_autofill.fill_and_save(region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = ["name", "organization"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.autofill_and_verify(
-            autofill_popup, field, address_autofill_data, util
-        )
+        address_autofill.clear_and_verify(field, address_autofill_data, region=region)