Merge pull request #485 from mozilla/philimon/l10n_modify

Philimon/L10N_Script_Modification

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture()
 def region():
-    return os.environ.get("STARFOX_REGION", "US")
+    return os.environ.get("FX_REGION", "US")
 
 
 @pytest.fixture()

l10n_CM/Unified/test_demo_ad_autofill_name_org.py

@@ -1,6 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
+from l10n_CM.Unified.conftest import autofill_popup
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
@@ -11,43 +12,44 @@ def test_case():
     return "2888558"
 
 
-def test_demo_ad_autofill_name_org(driver: Firefox, region: str):
+def test_demo_ad_autofill_name_org(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+):
     """
     C2888558 - Verify Autofill functionality when selecting an entry from the dropdown for name/org fields
     """
-    # Instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-
     # 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
-    address_autofill_popup.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Double inside Name field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["name"])
 
     # Click on the first element from the autocomplete dropdown
-    first_item = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify autofill data
     address_autofill.verify_autofill_data(address_autofill_data, region, util)
 
     # Double inside Name field and select clear form autofill
     address_autofill.double_click("form-field", labels=["name"])
-    address_autofill_popup.click_clear_form_option()
+    autofill_popup.click_clear_form_option()
 
     # Double inside Organization field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["organization"])
 
     # Click on the first element from the autocomplete dropdown
-    first_item = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify autofill data
     address_autofill.verify_autofill_data(address_autofill_data, region, util)

l10n_CM/Unified/test_demo_ad_autofill_phone_email.py

@@ -11,43 +11,45 @@ def test_case():
     return "2888569"
 
 
-def test_demo_ad_autofill_phone_email(driver: Firefox, region: str):
+def test_demo_ad_autofill_phone_email(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+):
     """
     C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for tele/email fields
     """
-    # Instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
 
     # 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
-    address_autofill_popup.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Double inside phone field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["tel"])
 
     # Click on the first element from the autocomplete dropdown
-    first_item = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify autofill data
     address_autofill.verify_autofill_data(address_autofill_data, region, util)
 
     # Double inside phone field and select clear form autofill
     address_autofill.double_click("form-field", labels=["tel"])
-    address_autofill_popup.click_clear_form_option()
+    autofill_popup.click_clear_form_option()
 
     # Double inside email field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["email"])
 
     # Click on the first element from the autocomplete dropdown
-    first_item = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify autofill data
     address_autofill.verify_autofill_data(address_autofill_data, region, util)

l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py

@@ -38,17 +38,12 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
 
     # containing phone field
     expected_phone = address_autofill_data.telephone
-    # Skip verification if phone number isn't provided
-    if expected_phone:
-        with driver.context(driver.CONTEXT_CHROME):
-            actual_phone = autofill_popup.get_element("address-doorhanger-phone").text
-        normalize_expected = util.normalize_regional_phone_numbers(
-            expected_phone, region
-        )
-        normalized_actual = util.normalize_regional_phone_numbers(actual_phone, region)
-        assert normalized_actual == normalize_expected, (
-            f"Phone number mismatch for {region} | Expected: {normalize_expected}, Got: {normalized_actual}"
-        )
+    actual_phone = autofill_popup.get_cc_doorhanger_data("address-doorhanger-phone")
+    normalize_expected = util.normalize_regional_phone_numbers(expected_phone, region)
+    normalized_actual = util.normalize_regional_phone_numbers(actual_phone, region)
+    assert normalized_actual == normalize_expected, (
+        f"Phone number mismatch for {region} | Expected: {normalize_expected}, Got: {normalized_actual}"
+    )
 
     # Click the "Save" button
     autofill_popup.click_doorhanger_button("save")

l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -20,7 +20,6 @@ def region():
 @pytest.fixture()
 def add_prefs(region: str):
     return [
-        ("browser.search.region", region),
         ("extensions.formautofill.creditCards.supportedCountries", region),
         ("extensions.formautofill.addresses.supported", "on"),
     ]

l10n_CM/Unified/test_demo_ad_yellow_highlight.py

@@ -12,31 +12,30 @@ def test_case():
 
 
 def test_address_yellow_highlight_on_name_organization_fields(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    util: Utilities,
+    address_autofill: AddressFill,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888559 - Verify the yellow highlight appears on autofilled fields for name and organization.
     """
 
-    # Instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-
     # 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
-    address_autofill_popup.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Double click inside phone field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["name"])
 
     # Click on the first element from the autocomplete dropdown
-    first_item = address_autofill_popup.get_nth_element(1)
-    address_autofill_popup.click_on(first_item)
+    first_item = autofill_popup.get_nth_element(1)
+    autofill_popup.click_on(first_item)
 
     # Verify the name and organization fields are highlighted
     address_autofill.verify_field_yellow_highlights(

l10n_CM/Unified/test_demo_cc_add_new_credit_card.py

@@ -3,6 +3,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
+from l10n_CM.Unified.conftest import region
 from modules.page_object import AboutPrefs
 from modules.util import Utilities
 
@@ -28,7 +29,7 @@ def test_create_new_cc_profile(
     about_prefs_privacy.switch_to_saved_payments_popup_iframe()
 
     # Save CC information using fake data
-    credit_card_sample_data = util.fake_credit_card_data()
+    credit_card_sample_data = util.fake_credit_card_data(region)
 
     # Add a new CC profile
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])

l10n_CM/Unified/test_demo_cc_clear_form.py

@@ -13,6 +13,7 @@ def test_case():
 
 def test_cc_clear_form(
     driver: Firefox,
+    region: str,
     util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
@@ -28,7 +29,7 @@ def test_cc_clear_form(
     about_prefs_privacy.open()
     about_prefs_privacy.switch_to_saved_payments_popup_iframe()
 
-    credit_card_sample_data = util.fake_credit_card_data()
+    credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
     about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
 

l10n_CM/Unified/test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py

@@ -1,44 +1,43 @@
-import time
-
 import pytest
 from selenium.webdriver import Firefox
 
+from l10n_CM.Unified.conftest import region
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import CreditCardFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
 def test_case():
     return "2886597"
 
 
-def test_demo_cc_data_captured_in_doorhanger_and_stored(driver: Firefox, region: str):
+def test_demo_cc_data_captured_in_doorhanger_and_stored(
+    driver: Firefox,
+    region: str,
+    credit_card_fill_obj: CreditCardFill,
+    autofill_popup: AutofillPopup,
+    util: Utilities,
+    about_prefs_privacy: AboutPrefs,
+):
     """
     C2889999 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
     """
-
-    # Instantiate objects
-    credit_card_fill_obj = CreditCardFill(driver)
-    autofill_popup_obj = AutofillPopup(driver)
-    util = Utilities()
-    browser_action_obj = BrowserActions(driver)
-
     # Navigate to page
     credit_card_fill_obj.open()
 
     # Fill data
-    credit_card_sample_data = util.fake_credit_card_data()
+    credit_card_sample_data = util.fake_credit_card_data(region)
     credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
 
     # The "Save credit card?" doorhanger is displayed
-    assert autofill_popup_obj.element_visible("doorhanger-save-button"), (
+    assert autofill_popup.element_visible("doorhanger-save-button"), (
         "Credit card save doorhanger is not visible"
     )
 
     # Verify Credit Card Doorhanger Data
-    doorhanger_text = autofill_popup_obj.get_cc_doorhanger_data("cc-doorhanger-data")
+    doorhanger_text = autofill_popup.get_cc_doorhanger_data("cc-doorhanger-data")
     assert credit_card_sample_data.card_number[-4:] in doorhanger_text, (
         f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but not found."
     )
@@ -50,17 +49,18 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(driver: Firefox, region:
     )
 
     # Click the "Save" button using click_doorhanger_button
-    autofill_popup_obj.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_saved_payments_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
 
     # Get stored values
     elements = [
         x.strip()
-        for x in about_prefs.get_element("saved-credit-cards-values").text.split(",")
+        for x in about_prefs_privacy.get_element(
+            "saved-credit-cards-values"
+        ).text.split(",")
     ]
 
     # Validate stored values match expected values

l10n_CM/Unified/test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py

@@ -25,7 +25,7 @@ def test_cc_check_door_hanger_is_displayed(
     credit_card_fill_obj.open()
 
     # Fill data
-    credit_card_sample_data = util.fake_credit_card_data()
+    credit_card_sample_data = util.fake_credit_card_data(region)
     credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
 
     # Check if an element from the door hanger is visible