removed isolated and moved cc tests back to unified as well as add region to fake cc data

Author: philimon-reset

l10n_CM/Unified/conftest.py

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

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
 
@@ -14,6 +15,7 @@ def test_case():
 
 def test_create_new_cc_profile(
     driver: Firefox,
+    region: str,
     util: Utilities,
     about_prefs_privacy: AboutPrefs,
     about_prefs: AboutPrefs,
@@ -27,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,12 +1,11 @@
-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()
@@ -16,6 +15,7 @@ def test_case():
 
 def test_demo_cc_data_captured_in_doorhanger_and_stored(
     driver: Firefox,
+    region: str,
     credit_card_fill_obj: CreditCardFill,
     autofill_popup: AutofillPopup,
     util: Utilities,
@@ -28,7 +28,7 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
     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

l10n_CM/Unified/test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py

@@ -13,6 +13,7 @@ def test_case():
 
 def test_cc_check_door_hanger_is_displayed(
     driver: Firefox,
+    region: str,
     util: Utilities,
     autofill_popup: AutofillPopup,
     credit_card_fill_obj: CreditCardFill,
@@ -24,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

l10n_CM/Unified/test_demo_cc_dropdown_presence.py

@@ -13,6 +13,7 @@ def test_case():
 
 def test_dropdown_presence_credit_card(
     driver: Firefox,
+    region: str,
     util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
@@ -27,7 +28,7 @@ def test_dropdown_presence_credit_card(
     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_yellow_highlight.py

@@ -3,7 +3,7 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import AboutPrefs, CreditCardFill
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -13,6 +13,7 @@ def test_case():
 
 def test_cc_yellow_highlight(
     driver: Firefox,
+    region: str,
     util: Utilities,
     about_prefs_privacy: AboutPrefs,
     about_prefs: AboutPrefs,
@@ -26,7 +27,7 @@ def test_cc_yellow_highlight(
     # Save a credit card in about:preferences
     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.fill_cc_panel_information(credit_card_sample_data)
 

l10n_CM/region/Isolated.json

@@ -1,11 +1,17 @@
 {
   "tests": [
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_autofill_name_org.py",
-        "test_demo_ad_autofill_phone_email.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
-        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_yellow_highlight.py"
+    "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_autofill_name_org.py",
+    "test_demo_ad_autofill_phone_email.py",
+    "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+    "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_yellow_highlight.py",
+    "test_demo_cc_add_new_credit_card.py",
+    "test_demo_cc_clear_form.py",
+    "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
+    "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
+    "test_demo_cc_dropdown_presence.py",
+    "test_demo_cc_yellow_highlight.py"
   ]
 }

l10n_CM/region/Unified.json

@@ -5,7 +5,7 @@
 from json import load
 
 current_dir = os.path.dirname(__file__)
-valid_flags = {"--run-headless", "-n", "--reruns", "-isolated"}
+valid_flags = {"--run-headless", "-n", "--reruns"}
 flag_with_parameter = {"-n", "--reruns"}
 valid_region = {"US", "CA", "DE", "FR"}
 
@@ -108,11 +108,6 @@ def run_unified(regions, unified_flags):
 if __name__ == "__main__":
     arguments = sys.argv[1:]
     flags = get_flags_and_sanitize(arguments)
-    if "-isolated" in flags:
-        tests = get_region_tests("Isolated")
-        flags.remove("-isolated")
-        logging.info(f"Running Region Independent Tests.")
-        run_tests("US", flags, tests)
     if len(arguments) == 0:
         logging.info(f"Running Unified Tests for {valid_region} Regions.")
         run_unified(list(valid_region), flags)