fix exisitng test

Author: philimon-reset

l10n_CM/run_l10n.py

@@ -49,7 +49,7 @@
     "tiffany",
     "assos",
     "zooplus",
-    "duka"
+    "duka",
 }
 
 loaded_valid_sites = valid_l10n_mappings().keys()

modules/page_object_fxa_home.py

@@ -16,9 +16,11 @@ def fill_password(self, password: str) -> BasePage:
         self.set_content_context()
         self.fill("login-password-input", password, press_enter=False)
         self.get_element("submit-button").click()
-        self.element_visible("signed-in-status")
         return self
 
+    def is_otp_input_required(self) -> bool:
+        return len(self.get_elements("otp-input")) > 0
+
     def create_new_account(self, password: str, age=30) -> BasePage:
         """Fill out the password and age fields, then submit and wait for code"""
         self.fill("signup-password-input", password, press_enter=False)

tests/sync_and_fxa/conftest.py

@@ -8,9 +8,9 @@
 
 
 class FxaSession:
-    def __init__(self, url: str, password: str, restmail_session=None):
+    def __init__(self, url: str, password: str, restmail_session):
         self.client = Client(url)
-        self.restmail = restmail_session if restmail_session else TestEmailAccount()
+        self.restmail = restmail_session
         self.password = password
         self.otp_code = None
         logging.info(self.restmail.email)
@@ -54,20 +54,20 @@ def add_to_prefs_list():
     return []
 
 
+@pytest.fixture()
+def acct_password():
+    return "Test123???"
+
+
 @pytest.fixture()
 def fxa_session(
-    fxa_url: str, fxa_env: str, acct_password: str, fxa_test_account, request
-) -> FxaSession:
+    fxa_url: str, fxa_env: str, acct_password: str, restmail_session, request
+):
     """Create a PyFxA object and return a dict with artifacts"""
-    # Create a testing account using an @restmail.net address.
+    # Create a testing account using and @restmail.net address.
     if fxa_env == "stage":
         fxa_url = "https://api-accounts.stage.mozaws.net"
-    if fxa_test_account:
-        prep = FxaSession(
-            fxa_url, acct_password, request.getfixturevalue("restmail_session")
-        )
-    else:
-        prep = FxaSession(fxa_url, acct_password)
+    prep = FxaSession(fxa_url, acct_password, restmail_session)
     prep.restmail.clear()
     yield prep
     prep.destroy_account()
@@ -76,7 +76,7 @@ def fxa_session(
 @pytest.fixture()
 def fxa_test_account():
     """return none by default"""
-    return None
+    return None, None
 
 
 @pytest.fixture()
@@ -86,10 +86,11 @@ def restmail_session(fxa_test_account) -> TestEmailAccount:
 
 
 @pytest.fixture()
-def create_fxa(fxa_session: FxaSession, get_otp_code) -> FxaSession:
+def create_fxa(restmail_session, fxa_session: FxaSession, get_otp_code) -> FxaSession:
     """Create FxA from a PyFxA object"""
     fxa_session.create_account()
-    fxa_session.session.verify_email_code(get_otp_code())
+    code = get_otp_code(restmail_session) if restmail_session else get_otp_code()
+    fxa_session.session.verify_email_code(code)
     return fxa_session
 
 

tests/sync_and_fxa/test_existing_fxa.py

@@ -27,6 +27,7 @@ def test_sync_existing_fxa(
     driver: Firefox,
     fxa_test_account: Tuple[str, str],
     restmail_session,
+    get_otp_code,
     screenshot,
 ):
     """C131098: User is able to log in with existing FxAccount"""
@@ -36,5 +37,9 @@ def test_sync_existing_fxa(
     fxa = FxaHome(driver)
     fxa.sign_up_sign_in(email)
     fxa.fill_password(password)
+    if fxa.is_otp_input_required():
+        otp = get_otp_code(restmail_session)
+        fxa.fill_otp_code(otp)
+    fxa.element_visible("signed-in-status")
     status_element = fxa.get_element("signed-in-status").find_element(By.TAG_NAME, "p")
     assert "You’re signed in" in status_element.text

tests/sync_and_fxa/test_new_fxa.py

@@ -16,11 +16,6 @@ def fxa_env():
     return "stage"
 
 
-@pytest.fixture()
-def acct_password():
-    return "Test123???"
-
-
 def test_sync_new_fxa(driver: Firefox, fxa_url: str, fxa_session: dict, get_otp_code):
     """C131094: The user is able to create a new Firefox Account"""