Merge branch 'main' into as/adaptive-history-autofill

Author: ben-c-at-moz

conftest.py

@@ -177,7 +177,8 @@ def driver(
                 separator = " "
         winsize = [int(s) for s in opt_window_size.split(separator)]
         driver.set_window_size(*winsize)
-        driver.implicitly_wait(opt_implicit_timeout)
+        timeout = 30 if opt_ci else opt_implicit_timeout
+        driver.implicitly_wait(timeout)
         yield driver
 
     finally:

modules/browser_object_panel_ui.py

@@ -75,6 +75,15 @@ def click_sync_sign_in_button(self) -> BasePage:
             self.select_panel_setting("fxa-sign-in")
         return self
 
+    def log_out_fxa(self) -> BasePage:
+        """
+        Click FxA signout button.
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.click_sync_sign_in_button()
+            self.get_element("fxa-sign-out-button").click()
+        return self
+
     def manage_fxa_account(self) -> BasePage:
         """
         Open the FxA management flow.
@@ -90,5 +99,19 @@ def confirm_sync_in_progress(self) -> BasePage:
         """
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.click_sync_sign_in_button()
-            self.element_has_text("fxa-sync-label", "Syncing")
+            self.custom_wait(timeout=30, poll_frequency=0.5).until(
+                EC.text_to_be_present_in_element(
+                    self.get_selector("fxa-sync-label"), "Syncing"
+                )
+            )
+        return self
+
+    def start_sync(self) -> BasePage:
+        """
+        Start FxA sync
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.click_sync_sign_in_button()
+            self.element_has_text("fxa-sync-label", "Sync now")
+            self.get_element("fxa-sync-label").click()
         return self

modules/data/fxa_new_account.components.json renamed to modules/data/fxa_home.components.json

@@ -5,6 +5,7 @@
         "groups": [
             "requiredForPage"
         ]
+
     },
 
     "submit-button": {
@@ -15,13 +16,13 @@
         ]
     },
 
-    "password-input": {
+    "signup-password-input": {
         "selectorData": "[data-testid='new-password-input-field']",
         "strategy": "css",
         "groups": []
     },
 
-    "password-repeat-input": {
+    "signup-password-repeat-input": {
         "selectorData": "[data-testid='verify-password-input-field']",
         "strategy": "css",
         "groups": []
@@ -39,12 +40,24 @@
         "groups": []
     },
 
-    "otp-input": {
+    "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",
@@ -58,7 +71,7 @@
     },
 
     "login-password-input": {
-        "selectorData": "input#password",
+        "selectorData": "input[type='password']",
         "strategy": "css",
         "groups": []
     },

modules/page_object.py

@@ -10,7 +10,7 @@
 from modules.page_object_autofill_credit_card import *
 from modules.page_object_autofill_test_basic import *
 from modules.page_object_example_page import *
-from modules.page_object_fxa_new_account import *
+from modules.page_object_fxa_home import *
 from modules.page_object_generics import *
 from modules.page_object_google_search import *
 from modules.page_object_wiki_firefox_logo import *

modules/page_object_fxa_new_account.py renamed to modules/page_object_fxa_home.py

@@ -1,11 +1,11 @@
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
+from selenium.webdriver.support import expected_conditions as EC
+
 from modules.page_base import BasePage
 
 
-class FxaNewAccount(BasePage):
-    """
-    Page Object Model for FxA signup flow.
-    Initialize with fxa_url=<the url of the FxA instance>
-    """
+class FxaHome(BasePage):
+    """Page Object Model for FxA pages"""
 
     URL_TEMPLATE = "{fxa_url}"
 
@@ -15,16 +15,30 @@ def sign_up_sign_in(self, email: str) -> BasePage:
         self.get_element("submit-button").click()
         return self
 
+    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")
+        return self
+
     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("password-input", password, press_enter=False)
-        self.fill("password-repeat-input", password, press_enter=False)
+        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.element_clickable("submit-button")
         self.get_element("submit-button").click()
         self.element_has_text("card-header", "Enter confirmation code")
         return self
 
-    def confirm_new_account(self, otp: str) -> BasePage:
+    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()

modules/page_object_wiki_firefox_logo.py

@@ -21,6 +21,7 @@ def get_image(self) -> WebElement:
         return self.get_element("firefox-logo")
 
     def verify_opened_image_url(self):
+        self.url_contains("wikimedia")
         current_url = self.driver.current_url
 
         pattern = r"https://upload\.wikimedia\.org/wikipedia/commons/thumb/a/a0/Firefox_logo%2C_2019\.svg/\d+px-Firefox_logo%2C_2019\.svg\.png"

taskcluster/requirements.txt

@@ -16,9 +16,9 @@ binaryornot==0.4.4 \
     --hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \
     --hash=sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4
     # via cookiecutter
-certifi==2023.7.22 \
-    --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
-    --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9
+certifi==2024.7.4 \
+    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
+    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
     # via requests
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \

tests/address_bar_and_search/test_intervention_card_refresh_firefox.py

@@ -19,6 +19,7 @@ def add_prefs():
     ]
 
 
+@pytest.mark.unstable
 def test_intervention_card_refresh(driver: Firefox):
     """
     C1365204.1: regular firefox, check the intervention card

tests/sync_and_fxa/conftest.py

@@ -1,4 +1,5 @@
 import logging
+from datetime import datetime
 from time import sleep
 
 import pytest
@@ -7,6 +8,22 @@
 from fxa.tests.utils import TestEmailAccount
 
 
+class FxaPrep:
+    def __init__(self, url: str, password: str):
+        self.client = Client(url)
+        self.restmail = TestEmailAccount()
+        self.password = password
+        self.otp_code = None
+        logging.info(self.restmail.email)
+        logging.info(self.password)
+
+    def create_account(self):
+        self.session = self.client.create_account(self.restmail.email, self.password)
+
+    def destroy_account(self):
+        self.client.destroy_account(self.restmail.email, self.password)
+
+
 @pytest.fixture()
 def suite_id():
     return ("S2130", "Sync & Firefox Account")
@@ -16,6 +33,13 @@ def suite_id():
 def fxa_url(fxa_env):
     if fxa_env == "stage":
         return "https://accounts.stage.mozaws.net"
+    elif fxa_env == "prod":
+        return "https://accounts.firefox.com"
+
+
+@pytest.fixture()
+def start_time():
+    return datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")
 
 
 @pytest.fixture()
@@ -25,39 +49,50 @@ def set_prefs(fxa_url):
 
 
 @pytest.fixture()
-def new_fxa_prep(fxa_url: str, acct_password: str) -> dict:
+def new_fxa_prep(fxa_url: str, acct_password: str) -> FxaPrep:
     """Create a PyFxA object and return a dict with artifacts"""
     # Create a testing account using an @restmail.net address.
-    acct = TestEmailAccount()
-    client = Client(fxa_url)
-    yield {
-        "client": client,
-        "restmail": acct,
-        "password": acct_password,
-        "otp_code": None,
-    }
-    acct.clear()
+    prep = FxaPrep(fxa_url, acct_password)
+    prep.restmail.clear()
+    yield prep
     try:
-        client.destroy_account(acct.email, acct_password)
+        prep.destroy_account()
     except OutOfProtocolError as e:
         logging.info(repr(e))
 
 
 @pytest.fixture()
-def get_otp_code(new_fxa_prep):
+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:
+    """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
+
+
+@pytest.fixture()
+def get_otp_code(start_time: str):
     """Function factory: wait for the OTP email, then return the OTP code"""
 
-    def _get_otp_code() -> str:
-        acct = new_fxa_prep["restmail"]
+    def _get_otp_code(restmail: TestEmailAccount) -> str:
+        acct = restmail
+        code_header_names = ["x-verify-short-code", "x-signin-verify-code"]
         logging.info("==========")
         for _ in range(60):
             acct.fetch()
             logging.info("---")
             for m in acct.messages:
-                logging.info("Email headers")
-                logging.info(m["headers"])
-                if "x-verify-short-code" in m["headers"]:
-                    return m["headers"]["x-verify-short-code"]
+                logging.info("Parsing email message...")
+                if m["receivedAt"] < start_time:
+                    continue
+                for header_name in code_header_names:
+                    if header_name in m["headers"]:
+                        return m["headers"][header_name]
             sleep(0.5)
         assert False, f"No OTP code found in {acct.email}."
 

tests/sync_and_fxa/test_existing_fxa.py

@@ -0,0 +1,43 @@
+import logging
+from typing import Tuple
+
+import pytest
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
+from selenium.webdriver import Firefox
+from selenium.webdriver.support import expected_conditions as EC
+
+from modules.browser_object import PanelUi
+from modules.page_object import FxaHome
+
+
+@pytest.fixture()
+def fxa_env():
+    return "stage"
+
+
+@pytest.fixture()
+def fxa_test_account():
+    return ("[email protected]", "Test123???")
+
+
+@pytest.mark.unstable
+def test_sync_existing_fxa(
+    driver: Firefox, fxa_test_account: Tuple[str, str], restmail_session, get_otp_code
+):
+    (username, 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.fill_password(password)
+
+    try:
+        fxa.custom_wait(timeout=15).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
+    panel_ui.confirm_sync_in_progress()