Merge branch 'main' into vs/test_default_search_provide_can_be_changed

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

@@ -82,6 +82,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.
@@ -97,5 +106,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/data/navigation.components.json

@@ -160,5 +160,29 @@
         "groups": [
             "doNotCache"
         ]
+    },
+
+    "sponsored-site-card": {
+        "selectorData": "top-site-outer",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "sponsored-site-card-menu-button": {
+        "selectorData": "button[class=\"context-menu-button icon\"]",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "sponsored-site-context-menu": {
+        "selectorData": "context-menu",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "sponsored-site-context-menu-list": {
+        "selectorData": "ul[class=\"context-menu-list\"]",
+        "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"

modules/util.py

@@ -6,7 +6,7 @@
 import re
 from os import remove
 from random import shuffle
-from typing import Literal, Union
+from typing import List, Literal, Union
 
 from faker import Faker
 from faker.providers import internet, misc
@@ -266,6 +266,56 @@ def fake_credit_card_data(self) -> CreditCardBase:
 
         return fake_data
 
+    def write_css_properties(
+        self, file_path: str, element: WebElement, driver: Firefox, chrome=False
+    ):
+        """
+        Executes JavaScript to get all of the CSS properties of a WebElement then dumps it in the specified file path location. Outputs in JSON format
+        """
+        css_properties = ""
+        if chrome:
+            with driver.context(driver.CONTEXT_CHROME):
+                css_properties = driver.execute_script(
+                    """
+var s = window.getComputedStyle(arguments[0]);
+var props = {};
+for (var i = 0; i < s.length; i++) {
+    props[s[i]] = s.getPropertyValue(s[i]);
+}
+return props;
+            """,
+                    element,
+                )
+
+        else:
+            css_properties = driver.execute_script(
+                """
+var s = window.getComputedStyle(arguments[0]);
+var props = {};
+for (var i = 0; i < s.length; i++) {
+    props[s[i]] = s.getPropertyValue(s[i]);
+}
+return props;
+    """,
+                element,
+            )
+
+        with open(file_path, "w") as file:
+            json.dump(css_properties, file, indent=4)
+        logging.info(f"CSS properties saved to {file_path}")
+
+    def match_regex(self, pattern: str, to_match: List[str]) -> List[str]:
+        """
+        Given a list of logs/strings, this method will return the matches within the string that match the given regex expression.
+        """
+        matches = []
+        for string in to_match:
+            match = re.findall(pattern, string)
+            if len(match) > 0:
+                matches.append(match[0])
+
+        return matches
+
     def normalize_phone_number(self, phone: str, default_country_code="1") -> str:
         """
         Given a phone number in some format, +1(xxx)-xxx-xxxx or something similar, it will strip the phone number

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/conftest.py

@@ -20,6 +20,11 @@ def set_prefs(add_prefs: dict):
         ("privacy.donottrackheader.enabled", False),
         ("telemetry.fog.test.localhost_port", 5312),
         ("datareporting.healthreport.uploadEnabled", True),
+        ("browser.newtabpage.enabled", True),
+        ("browser.newtabpage.activity-stream.system.showSponsored", True),
+        ("browser.newtabpage.activity-stream.showSponsoredTopSites", True),
+        ("browser.topsites.useRemoteSetting", True),
+        ("browser.topsites.contile.enabled", True),
     ]
     prefs.extend(add_prefs)
     return prefs