more fixes to the tests

Author: philimon-reset

SELECTOR_INFO.md

@@ -1537,15 +1537,8 @@ Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
 Selector Name: address-doorhanger-zip
-Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(5)"
-Description: Save address doorhanger zip section for US and CA
-Location: Address bar
-Path to .json: modules/data/autofill_popup.components.json
-```
-```
-Selector Name: address-doorhanger-zip-other
-Selector Data: "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-of-type(3)",
-Description: Save address doorhanger zip section for other regions
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(4) span:nth-last-of-type(1)"
+Description: Save address doorhanger zip section
 Location: Address bar
 Path to .json: modules/data/autofill_popup.components.json
 ```

l10n_CM/Unified/test_demo_ad_1a_dropdown_name_org_fields.py

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

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)
+    address_autofill.fill_and_save(util, autofill_popup, region)
 
     fields_to_test = [
         "street-address",

l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py

@@ -25,7 +25,7 @@ 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)
+    address_autofill.fill_and_save(util, autofill_popup, region)
 
     fields_to_test = ["email", "tel"]
 

l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py

@@ -23,11 +23,11 @@ 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)
+    autofill_data = address_autofill.fill_and_save(util, autofill_popup, 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
+            field, autofill_data, autofill_popup, util, 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)
+    autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
     # Hover over each field and check data preview
     fields_to_test = [
@@ -45,5 +45,5 @@ def test_hover_address_is_previewed(
     ]
     for field in fields_to_test:
         address_autofill.check_autofill_preview_for_field(
-            field, autofill_data, autofill_popup, util
+            field, autofill_data, autofill_popup, util, region
         )

l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py

@@ -22,11 +22,11 @@ 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)
+    autofill_data = address_autofill.fill_and_save(util, autofill_popup, 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
+            field, autofill_data, autofill_popup, util, 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)
+    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = [

l10n_CM/Unified/test_demo_ad_3b_autofill_name_org_fields.py

@@ -23,7 +23,7 @@ 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)
+    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = ["name", "organization"]

l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py

@@ -23,7 +23,7 @@ def test_demo_ad_autofill_phone_email(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup)
+    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = ["email", "tel"]