l10n clean up

philimon-reset · philimon-reset · commit 786a2f8ee8dd · 2025-04-29T14:34:02.000+02:00
diff --git a/l10n_CM/Unified/conftest.py b/l10n_CM/Unified/conftest.py
@@ -30,14 +30,14 @@ def get_html_files(live_site, region):
         parent_dir + f"/sites/{live_site}/{region}/{live_site}_ad.html"
     )
     cc_path_to_site = parent_dir + f"/sites/{live_site}/{region}/{live_site}_cc.html"
+    address_html_file, cc_html_file = "", ""
     if os.path.exists(address_path_to_site) and os.path.exists(cc_path_to_site):
-        address_html_file, cc_html_file = "", ""
         with open(address_path_to_site, "r", encoding="utf-8") as fp:
             address_html_file = fp.read()
         with open(cc_path_to_site, "r", encoding="utf-8") as fp:
             cc_html_file = fp.read()
         return address_html_file, cc_html_file
-    return "", ""
+    return address_html_file, cc_html_file
 
 
 @pytest.fixture()
diff --git a/l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py b/l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_dropdown_presence_address_field(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_dropdown_presence_email_phone_field(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_hover_name_org(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_2b_preview_address_fields.py b/l10n_CM/Unified/test_demo_ad_2b_preview_address_fields.py
@@ -1,11 +1,9 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -26,8 +24,6 @@ def test_hover_address_is_previewed(
     region: str,
     about_prefs_privacy: AboutPrefs,
     address_autofill: AddressFill,
-    autofill_popup: AutofillPopup,
-    util: Utilities,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py
@@ -1,11 +1,9 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -18,8 +16,6 @@ def test_hover_email_and_phone_autofill_preview(
     region: str,
     about_prefs_privacy: AboutPrefs,
     address_autofill: AddressFill,
-    autofill_popup: AutofillPopup,
-    util: Utilities,
     fill_and_save_address: AutofillAddressBase,
 ):
     # Create fake data
diff --git a/l10n_CM/Unified/test_demo_ad_3a_autofill_address_fields.py b/l10n_CM/Unified/test_demo_ad_3a_autofill_address_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_autofill_address_fields(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_3b_autofill_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_3b_autofill_name_org_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_autofill_name_org(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    autofill_popup: AutofillPopup,
-    util: Utilities,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_autofill_phone_email(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    autofill_popup: AutofillPopup,
-    util: Utilities,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py
@@ -4,7 +4,6 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,7 +15,6 @@ def test_address_yellow_highlight_on_name_organization_fields(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
diff --git a/l10n_CM/Unified/test_demo_ad_4b_highlight_address_fields.py b/l10n_CM/Unified/test_demo_ad_4b_highlight_address_fields.py
@@ -4,7 +4,6 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,7 +15,6 @@ def test_address_yellow_highlight_address_fields(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
diff --git a/l10n_CM/Unified/test_demo_ad_4c_highlight_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_4c_highlight_phone_email_fields.py
@@ -4,7 +4,6 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,7 +15,6 @@ def test_address_yellow_highlight_address_fields(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
diff --git a/l10n_CM/Unified/test_demo_ad_5a_clear_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_5a_clear_name_org_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_clear_name_org(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_5b_clear_address_fields.py b/l10n_CM/Unified/test_demo_ad_5b_clear_address_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_clear_address_fields(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,8 +14,6 @@ def test_demo_ad_clear_tel_email(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
     fill_and_save_address: AutofillAddressBase,
 ):
     """
diff --git a/l10n_CM/Unified/test_demo_ad_6_capture_doorhanger_appearance.py b/l10n_CM/Unified/test_demo_ad_6_capture_doorhanger_appearance.py
@@ -3,7 +3,6 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -15,7 +14,6 @@ def test_address_doorhanger_displayed_after_entering_valid_address(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     is_live_site: str,
 ):
diff --git a/l10n_CM/Unified/test_demo_ad_7a_capture_doorhanger_stored_data_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_7a_capture_doorhanger_stored_data_name_org_fields.py
@@ -4,7 +4,6 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,7 +15,6 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
     is_live_site: str,
diff --git a/l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py b/l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py
@@ -4,7 +4,6 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,7 +15,6 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     driver: Firefox,
     region: str,
     address_autofill: AddressFill,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
     is_live_site: str,
diff --git a/l10n_CM/Unified/test_demo_cc_0_add_new_credit_card.py b/l10n_CM/Unified/test_demo_cc_0_add_new_credit_card.py
@@ -5,7 +5,6 @@
 
 from modules.classes.credit_card import CreditCardBase
 from modules.page_object import AboutPrefs
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -16,7 +15,6 @@ def test_case():
 def test_create_new_cc_profile(
     driver: Firefox,
     region: str,
-    util: Utilities,
     about_prefs_privacy: AboutPrefs,
     populate_saved_payments: CreditCardBase,
 ):
diff --git a/l10n_CM/Unified/test_demo_cc_1_dropdown.py b/l10n_CM/Unified/test_demo_cc_1_dropdown.py
@@ -1,10 +1,8 @@
 import pytest
-from selenium.webdriver import ActionChains, Firefox
+from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.credit_card import CreditCardBase
 from modules.page_object import AboutPrefs, CreditCardFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -15,9 +13,6 @@ def test_case():
 def test_dropdown_presence_credit_card(
     driver: Firefox,
     region: str,
-    util: Utilities,
-    autofill_popup: AutofillPopup,
-    about_prefs_privacy: AboutPrefs,
     credit_card_autofill: CreditCardFill,
     fill_and_save_payments: CreditCardBase,
 ):
diff --git a/l10n_CM/Unified/test_demo_cc_2_preview.py b/l10n_CM/Unified/test_demo_cc_2_preview.py
@@ -21,7 +21,6 @@ def test_cc_preview(
     driver: Firefox,
     util: Utilities,
     region: str,
-    about_prefs_privacy: AboutPrefs,
     autofill_popup: AutofillPopup,
     credit_card_autofill: CreditCardFill,
     fill_and_save_payments: CreditCardBase,
diff --git a/l10n_CM/Unified/test_demo_cc_3_autofill.py b/l10n_CM/Unified/test_demo_cc_3_autofill.py
@@ -14,7 +14,6 @@ def test_case():
 
 def test_cc_autofill_from_dropdown(
     driver: Firefox,
-    util: Utilities,
     autofill_popup: AutofillPopup,
     credit_card_autofill: CreditCardFill,
     fill_and_save_payments: CreditCardBase,
@@ -26,7 +25,6 @@ def test_cc_autofill_from_dropdown(
     Arguments:
         credit_card_autofill: CreditCardFill instance
         autofill_popup: AutofillPopup instance
-        util: Utilities instance
         region: region being tested
         fill_and_save_payments: fixture to populate data before test.
     """
diff --git a/l10n_CM/Unified/test_demo_cc_4_highlight.py b/l10n_CM/Unified/test_demo_cc_4_highlight.py
diff --git a/l10n_CM/Unified/test_demo_cc_5_clear.py b/l10n_CM/Unified/test_demo_cc_5_clear.py
diff --git a/l10n_CM/Unified/test_demo_cc_6_capture_doorhanger_appearance.py b/l10n_CM/Unified/test_demo_cc_6_capture_doorhanger_appearance.py
diff --git a/l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py b/l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py
