sync fxa test rework

philimon-reset · philimon-reset · commit 8290ceb7bf45 · 2025-08-11T17:47:00.000+02:00
diff --git a/SELECTOR_INFO.md b/SELECTOR_INFO.md
@@ -2056,6 +2056,20 @@ Location: In the FxA signin page flow
 Path to .json: modules/data/fxa_home.components.json
 ```
 ```
+Selector Name: signed-in-status
+Selector Data: "div[role='status']"
+Description: Sign in status
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: manage-sync-button
+Selector Data: "signup_confirmed_sync_manage_sync_button"
+Description: sign up and sync confirmation
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
 Selector Name: signin-otp-input
 Selector Data: "[data-testid='signin-token-code-input-field']"
 Description: The FxAccount One Time Password entry field
diff --git a/modules/data/fxa_home.components.json b/modules/data/fxa_home.components.json
@@ -1,94 +1,91 @@
 {
-    "login-email-input": {
-        "selectorData": "input[name='email']",
-        "strategy": "css",
-        "groups": [
-            "requiredForPage"
-        ]
-
-    },
-
-    "submit-button": {
-        "selectorData": "button[type='submit']",
-        "strategy": "css",
-        "groups": [
-            "doNotCache"
-        ]
-    },
-
-    "signup-password-input": {
-        "selectorData": "[data-testid='new-password-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "signup-password-repeat-input": {
-        "selectorData": "[data-testid='verify-password-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "age-input": {
-        "selectorData": "[data-testid='age-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "card-header": {
-        "selectorData": "card-header",
-        "strategy": "class",
-        "groups": []
-    },
-
-    "signup-otp-input": {
-        "selectorData": "[data-testid='confirm-signup-code-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "signin-otp-input": {
-        "selectorData": "[data-testid='signin-token-code-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "otp-input": {
-        "selectorData": "input[inputmode='numeric']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "connected-heading": {
-        "selectorData": "fxa-connected-heading",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "continue-browsing-link": {
-        "selectorData": "cad-not-now",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "login-password-input": {
-        "selectorData": "input[type='password']",
-        "strategy": "css",
-        "groups": []
-    },
-    "do-it-later-button": {
-        "selectorData": "inline_recovery_key_setup_create_do_it_later",
-        "strategy": "id",
-        "groups": []
-    },
-     "not-now-button": {
-        "selectorData": "choice-pair-not-now",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "sign-in-button": {
-        "selectorData": "use-logged-in",
-        "strategy": "id",
-        "groups": []
-    }
+  "login-email-input": {
+    "selectorData": "input[name='email']",
+    "strategy": "css",
+    "groups": [
+      "requiredForPage"
+    ]
+  },
+  "submit-button": {
+    "selectorData": "button[type='submit']",
+    "strategy": "css",
+    "groups": [
+      "doNotCache"
+    ]
+  },
+  "signup-password-input": {
+    "selectorData": "[data-testid='new-password-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "signup-password-repeat-input": {
+    "selectorData": "[data-testid='verify-password-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "age-input": {
+    "selectorData": "[data-testid='age-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "card-header": {
+    "selectorData": "card-header",
+    "strategy": "class",
+    "groups": []
+  },
+  "signup-otp-input": {
+    "selectorData": "[data-testid='confirm-signup-code-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "signin-otp-input": {
+    "selectorData": "[data-testid='signin-token-code-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "otp-input": {
+    "selectorData": "input[inputmode='numeric']",
+    "strategy": "css",
+    "groups": []
+  },
+  "connected-heading": {
+    "selectorData": "fxa-connected-heading",
+    "strategy": "id",
+    "groups": []
+  },
+  "continue-browsing-link": {
+    "selectorData": "cad-not-now",
+    "strategy": "id",
+    "groups": []
+  },
+  "login-password-input": {
+    "selectorData": "input[type='password']",
+    "strategy": "css",
+    "groups": []
+  },
+  "signed-in-status": {
+    "selectorData": "div[role='status']",
+    "strategy": "css",
+    "groups": []
+  },
+  "manage-sync-button": {
+    "selectorData": "signup_confirmed_sync_manage_sync_button",
+    "strategy": "id",
+    "groups": []
+  },
+  "do-it-later-button": {
+    "selectorData": "inline_recovery_key_setup_create_do_it_later",
+    "strategy": "id",
+    "groups": []
+  },
+  "not-now-button": {
+    "selectorData": "choice-pair-not-now",
+    "strategy": "id",
+    "groups": []
+  },
+  "sign-in-button": {
+    "selectorData": "use-logged-in",
+    "strategy": "id",
+    "groups": []
+  }
 }
diff --git a/modules/page_base.py b/modules/page_base.py
@@ -453,6 +453,11 @@ def title_contains(self, url_part: str) -> Page:
         self.expect(EC.title_contains(url_part))
         return self
 
+    def title_is(self, url_part: str) -> Page:
+        """Expect helper: wait until driver URL is given text or timeout"""
+        self.expect(EC.title_is(url_part))
+        return self
+
     def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         """
         Given a part of a URL and a regex, wait for that substring to exist in
diff --git a/modules/page_object_fxa_home.py b/modules/page_object_fxa_home.py
@@ -1,4 +1,5 @@
 from selenium.common.exceptions import NoSuchElementException, TimeoutException
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
 from modules.page_base import BasePage
@@ -19,13 +20,7 @@ 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()
-        # If OTP is needed, wait for the field to be ready, else move on.
-        try:
-            self.custom_wait(timeout=3).until(
-                EC.presence_of_element_located(self.get_selector("connected-heading"))
-            )
-        except (TimeoutException, NoSuchElementException):
-            self.element_exists("otp-input")
+        self.element_visible("signed-in-status")
         return self
 
     def create_new_account(self, password: str, age=30) -> BasePage:
@@ -42,7 +37,7 @@ def fill_otp_code(self, otp: str) -> BasePage:
         """Given an OTP, confirm the account, submit, and wait for account activation"""
         self.fill("otp-input", otp, press_enter=False)
         self.get_element("submit-button").click()
-        # self.element_exists("connected-heading")
+        self.title_is("Mozilla accounts")
         return self
 
     def finish_account_setup(self, password: str) -> BasePage:
@@ -51,6 +46,5 @@ def finish_account_setup(self, password: str) -> BasePage:
         self.driver.switch_to.window(self.driver.window_handles[-1])
         self.fill("login-password-input", password, press_enter=False)
         self.get_element("submit-button").click()
-        # self.get_element("do-it-later-button").click()
-        # self.get_element("not-now-button").click()
+        self.element_visible("signed-in-status")
         return self
diff --git a/tests/sync_and_fxa/conftest.py b/tests/sync_and_fxa/conftest.py
@@ -4,14 +4,13 @@
 
 import pytest
 from fxa.core import Client
-from fxa.errors import OutOfProtocolError
 from fxa.tests.utils import TestEmailAccount
 
 
-class FxaPrep:
-    def __init__(self, url: str, password: str):
+class FxaSession:
+    def __init__(self, url: str, password: str, restmail_session=None):
         self.client = Client(url)
-        self.restmail = TestEmailAccount()
+        self.restmail = restmail_session if restmail_session else TestEmailAccount()
         self.password = password
         self.otp_code = None
         logging.info(self.restmail.email)
@@ -56,29 +55,42 @@ def add_to_prefs_list():
 
 
 @pytest.fixture()
-def new_fxa_prep(fxa_url: str, fxa_env: str, acct_password: str) -> FxaPrep:
+def fxa_session(
+    fxa_url: str, fxa_env: str, acct_password: str, fxa_test_account, request
+) -> FxaSession:
     """Create a PyFxA object and return a dict with artifacts"""
     # Create a testing account using an @restmail.net address.
     if fxa_env == "stage":
         fxa_url = "https://api-accounts.stage.mozaws.net"
-    prep = FxaPrep(fxa_url, acct_password)
+    if fxa_test_account:
+        prep = FxaSession(
+            fxa_url, acct_password, request.getfixturevalue("restmail_session")
+        )
+    else:
+        prep = FxaSession(fxa_url, acct_password)
     prep.restmail.clear()
     yield prep
     prep.destroy_account()
 
 
+@pytest.fixture()
+def fxa_test_account():
+    """return none by default"""
+    return None
+
+
 @pytest.fixture()
 def restmail_session(fxa_test_account) -> TestEmailAccount:
     (username, _) = fxa_test_account
     return TestEmailAccount(email=username)
 
 
 @pytest.fixture()
-def create_fxa(new_fxa_prep: FxaPrep, get_otp_code) -> FxaPrep:
+def create_fxa(fxa_session: FxaSession, get_otp_code) -> FxaSession:
     """Create FxA from a PyFxA object"""
-    new_fxa_prep.create_account()
-    new_fxa_prep.session.verify_email_code(get_otp_code())
-    return new_fxa_prep
+    fxa_session.create_account()
+    fxa_session.session.verify_email_code(get_otp_code())
+    return fxa_session
 
 
 @pytest.fixture()
diff --git a/tests/sync_and_fxa/test_existing_fxa.py b/tests/sync_and_fxa/test_existing_fxa.py
@@ -4,6 +4,7 @@
 import pytest
 from selenium.common.exceptions import NoSuchElementException, TimeoutException
 from selenium.webdriver import Firefox
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
 from modules.browser_object import PanelUi
@@ -25,32 +26,18 @@ def fxa_test_account():
     return ("dte_stage_permanent@restmail.net", "Test123???")
 
 
-# Attempts to deflake this have not been entirely successful
-@pytest.mark.skip("Revisit when PyFxA is updated")
 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"""
-    (username, password) = fxa_test_account
+    (email, password) = fxa_test_account
     panel_ui = PanelUi(driver)
     panel_ui.click_sync_sign_in_button()
     fxa = FxaHome(driver)
-    fxa.sign_up_sign_in(username)
+    fxa.sign_up_sign_in(email)
     fxa.fill_password(password)
-
-    try:
-        fxa.custom_wait(timeout=5).until(
-            EC.presence_of_element_located(fxa.get_selector("otp-input"))
-        )
-        otp = get_otp_code(restmail_session)
-        logging.info(f"otp code: {otp}")
-        fxa.fill_otp_code(otp)
-    except (NoSuchElementException, TimeoutException):
-        pass
-    with driver.context(driver.CONTEXT_CHROME):
-        screenshot("screenshot_test_sync_existing_fxa_chrome")
-    panel_ui.confirm_sync_in_progress()
+    status_element = fxa.get_element("signed-in-status").find_element(By.TAG_NAME, "p")
+    assert "You’re signed in" in status_element.text
diff --git a/tests/sync_and_fxa/test_new_fxa.py b/tests/sync_and_fxa/test_new_fxa.py
