sync fxa first fix

Author: philimon-reset

Pipfile

@@ -16,7 +16,7 @@ pypom = "2.2.4"
 taskcluster-taskgraph = "==9.0.0"
 jsonpath-ng = "1.6.1"
 pillow = "<10.5"
-pyfxa = "0.7.0"
+pyfxa = "0.8.1"
 ruff = "0.9.6"
 pytest-rerunfailures = "14.0"
 slack-sdk = "3.31.0"

modules/browser_object_panel_ui.py

@@ -71,6 +71,21 @@ def click_sync_sign_in_button(self) -> BasePage:
         self.click_on("fxa-sign-in")
         return self
 
+    def open_account_toolbar(self):
+        """
+        Open the FxA account toolbar.
+        """
+        self.click_on("sync-user-button")
+        return self
+
+    def click_finish_sign_in_button(self):
+        """
+        Click FxA finish sign in button.
+        """
+        self.open_account_toolbar()
+        self.click_on("fxa-finish-sign-in")
+        return self
+
     def log_out_fxa(self) -> BasePage:
         """
         Click FxA signout button.
@@ -89,6 +104,15 @@ def manage_fxa_account(self) -> BasePage:
             self.get_element("fxa-manage-account-button").click()
         return self
 
+    @BasePage.context_chrome
+    def manage_fxa_finish_sign_in(self):
+        """
+        Open the FxA management flow to finish sign in.
+        """
+        self.open_account_toolbar()
+        self.click_on("fxa-manage-account-button")
+        return self
+
     def confirm_sync_in_progress(self) -> BasePage:
         """
         Check that FxA Sync Label is set to "Syncing…"

modules/data/fxa_home.components.json

@@ -1,6 +1,6 @@
 {
     "login-email-input": {
-        "selectorData": "input[type='email']",
+        "selectorData": "input[name='email']",
         "strategy": "css",
         "groups": [
             "requiredForPage"

modules/data/panel_ui.components.json

@@ -38,6 +38,11 @@
         "strategy": "css",
         "groups": []
     },
+    "fxa-finish-sign-in": {
+        "selectorData": "appMenu-header-description",
+        "strategy": "id",
+        "groups": []
+    },
 
     "fxa-sync-label": {
         "selectorData": "syncnow-label",
@@ -57,6 +62,8 @@
         "groups": []
     },
 
+
+
     "customize-toolbar": {
         "selectorData": "overflowMenu-customize-button",
         "strategy": "id",

modules/page_object_fxa_home.py

@@ -32,7 +32,7 @@ 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)
         self.fill("signup-password-repeat-input", password, press_enter=False)
-        self.fill("age-input", str(age), press_enter=False)
+        # self.fill("age-input", str(age), press_enter=False)
         self.element_clickable("submit-button")
         self.get_element("submit-button").click()
         self.element_has_text("card-header", "Enter confirmation code")
@@ -42,7 +42,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.element_exists("connected-heading")
         return self
 
     def finish_account_setup(self, password: str) -> BasePage:

modules/testrail_integration.py

@@ -392,7 +392,12 @@ def organize_l10n_entries(
         if not test_results[category].get(run_id):
             test_results[category][run_id] = []
         test_results[category][run_id].append(
-            {"suite_id": suite_id, "site": site, "test_case": test_case, "duration": f"{duration}s"}
+            {
+                "suite_id": suite_id,
+                "site": site,
+                "test_case": test_case,
+                "duration": f"{duration}s",
+            }
         )
 
     return test_results

tests/sync_and_fxa/conftest.py

@@ -62,10 +62,7 @@ def new_fxa_prep(fxa_url: str, acct_password: str) -> FxaPrep:
     prep = FxaPrep(fxa_url, acct_password)
     prep.restmail.clear()
     yield prep
-    try:
-        prep.destroy_account()
-    except OutOfProtocolError as e:
-        logging.info(repr(e))
+    prep.destroy_account()
 
 
 @pytest.fixture()

tests/sync_and_fxa/test_new_fxa.py

@@ -39,11 +39,9 @@ def test_sync_new_fxa(driver: Firefox, fxa_url: str, new_fxa_prep: dict, get_otp
     fxa.create_new_account(new_fxa_prep.password)
     otp = get_otp_code(new_fxa_prep.restmail)
     fxa.fill_otp_code(otp)
-    fxa.get_element("continue-browsing-link").click()
+    # fxa.get_element("continue-browsing-link").click()
 
     # Walk through the Finish Account Setup flow and confirm sync
-    fxa.driver.get(fxa_url)
-    fxa.get_element("submit-button").click()
-    panel_ui.manage_fxa_account()
+    panel_ui.manage_fxa_finish_sign_in()
     fxa.finish_account_setup(new_fxa_prep.password)
     panel_ui.confirm_sync_in_progress()