Merge pull request #543 from mozilla/as/l10n-improve-readability

Anca/ Improve l10n tests readability

Author: soncuteanca

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_verify_new_address_added.py renamed to l10n_CM/Unified/test_demo_ad_0_add_new_address.py

@@ -25,11 +25,7 @@ def test_dropdown_presence_name_organization(
 
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(address_autofill_data)
-
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
+    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_dropdown_presence_name_org.py renamed to l10n_CM/Unified/test_demo_ad_1a_dropdown_name_org_fields.py

@@ -25,11 +25,7 @@ def test_dropdown_presence_address_field(
 
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(address_autofill_data)
-
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
+    address_autofill.fill_and_save(util, autofill_popup, region)
 
     fields_to_test = [
         "street-address",

l10n_CM/Unified/test_demo_ad_dropdown_presence_address.py renamed to l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py

@@ -23,15 +23,9 @@ def test_dropdown_presence_email_phone_field(
     after the contact information was previously saved.
     """
 
-    # Open autofill page
+    # Open autofill page and fill fake data
     address_autofill.open()
-
-    # Generate and save fake data
-    address_autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(address_autofill_data)
-
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
+    address_autofill.fill_and_save(util, autofill_popup, region)
 
     fields_to_test = ["email", "tel"]
 

l10n_CM/Unified/test_demo_ad_autofill_dropdown_present_for_email_and_phone.py renamed to l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py

@@ -1,5 +1,3 @@
-import logging
-
 import pytest
 from selenium.webdriver import Firefox
 
@@ -25,15 +23,11 @@ def test_demo_ad_hover_name_org(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(autofill_data)
-
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
+    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_hover_name_org.py renamed to l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py

@@ -29,23 +29,21 @@ def test_hover_address_is_previewed(
     util: Utilities,
 ):
     """
-    C2888562: Verify that hovering over field will preview all fields
+    C2888562: Verify that hovering over address fields will preview all fields
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(address_autofill_data)
+    autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
     # Hover over each field and check data preview
-    for field in AddressFill.fields:
-        # hack to pass over fields that don't show up in autofill dropdown
-        if field == "address-level1" and region in ["DE", "FR"]:
-            continue
-        address_autofill.double_click("form-field", labels=[field])
-        autofill_popup.ensure_autofill_dropdown_visible()
-        autofill_popup.hover("select-form-option")
-        address_autofill.verify_autofill_data_on_hover(
-            address_autofill_data, autofill_popup, util
+    fields_to_test = [
+        "street-address",
+        "address-level2",  # city
+        "address-level1",  # state/province
+        "postal-code",
+        "country",
+    ]
+    for field in fields_to_test:
+        address_autofill.check_autofill_preview_for_field(
+            field, autofill_data, autofill_popup, util, region
         )

l10n_CM/Unified/test_demo_ad_hover_verify_address.py renamed to l10n_CM/Unified/test_demo_ad_2b_preview_address_fields.py

@@ -20,16 +20,13 @@ def test_hover_email_and_phone_autofill_preview(
     autofill_popup: AutofillPopup,
     util: Utilities,
 ):
+    # Create fake data and fill it in
     address_autofill.open()
-    autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(autofill_data)
-    autofill_popup.click_doorhanger_button("save")
+    autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
-    # Check Email field preview.
-    address_autofill.check_autofill_preview_for_field(
-        "email", autofill_data, autofill_popup, util
-    )
-    # Check Phone field preview (using the correct label "tel").
-    address_autofill.check_autofill_preview_for_field(
-        "tel", autofill_data, autofill_popup, util
-    )
+    # 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
+        )

l10n_CM/Unified/test_demo_ad_hover_over_tele_and_email_dropdown.py renamed to l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py

@@ -23,17 +23,13 @@ def test_demo_ad_autofill_address_fields(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(address_autofill_data)
-
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
+    address_autofill_data = address_autofill.fill_and_save(util, autofill_popup, region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = [
-        "street-address",
-        "address-level2",
         "address-level1",  # This will be skipped for DE/FR
+        "address-level2",
+        "street-address",
         "postal-code",
         "country",
     ]

l10n_CM/Unified/test_demo_ad_autofill_address_fields.py renamed to l10n_CM/Unified/test_demo_ad_3a_autofill_address_fields.py

@@ -23,11 +23,7 @@ def test_demo_ad_autofill_name_org(
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill_data = util.fake_autofill_data(region)
-    address_autofill.save_information_basic(address_autofill_data)
-
-    # Click the "Save" button
-    autofill_popup.click_doorhanger_button("save")
+    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"]