merge changes in

sarinali · sarinali · commit d39c1a51bc9e · 2024-07-09T09:20:50.000-04:00
diff --git a/conftest.py b/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:
diff --git a/modules/browser_object_navigation.py b/modules/browser_object_navigation.py
@@ -121,6 +121,32 @@ def search_bar_search(self, term: str) -> BasePage:
             self.search_bar.send_keys(term + Keys.ENTER)
         return self
 
+    def type_in_search_bar(self, term: str) -> BasePage:
+        """
+        Type in the *Old* Search Bar. Returns self.
+
+        Attributes
+        ----------
+
+        term : str
+            The search term
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.search_bar = self.find_element(By.CLASS_NAME, "searchbar-textbox")
+            self.search_bar.click()
+            self.search_bar.send_keys(term)
+        return self
+
+    def click_on_change_search_settings_button(self) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.search_bar = self.find_element(By.CLASS_NAME, "searchbar-textbox")
+            self.search_bar.click()
+            self.change_search_settings_button = self.find_element(
+                By.ID, "searchbar-anon-search-settings"
+            )
+            self.change_search_settings_button.click()
+        return self
+
     def click_in_awesome_bar(self) -> BasePage:
         self.set_awesome_bar()
         self.awesome_bar.click()
diff --git a/modules/browser_object_panel_ui.py b/modules/browser_object_panel_ui.py
@@ -66,6 +66,13 @@ def navigate_to_about_addons(self):
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.get_element("manage-themes").click()
 
+    def navigate_to_customize_toolbar(self):
+        """
+        On the hamburger menu > More Tools > Customize Toolbar
+        """
+        self.select_panel_setting("more-tools")
+        self.select_panel_setting("customize-toolbar")
+
     def click_sync_sign_in_button(self) -> BasePage:
         """
         Click FxA sync button.
@@ -75,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.
@@ -90,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
diff --git a/modules/data/fxa_home.components.json b/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": []
     },
diff --git a/modules/data/navigation.components.json b/modules/data/navigation.components.json
@@ -162,6 +162,18 @@
         ]
     },
 
+    "firefox-suggest": {
+    "selectorData": "div.urlbarView-row[label=\"Firefox Suggest\"] > span.urlbarView-row-inner",
+    "strategy": "css",
+    "groups": []
+    },
+
+    "search-result-autofill-adaptive-element": {
+        "selectorData": ".//*[@type='autofill_adaptive']",
+        "strategy": "xpath",
+        "groups": []
+    },
+
     "sponsored-site-card": {
         "selectorData": "top-site-outer",
         "strategy": "class",
diff --git a/modules/page_object.py b/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 *
diff --git a/modules/page_object_fxa_home.py b/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()
diff --git a/modules/page_object_wiki_firefox_logo.py b/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"
diff --git a/taskcluster/requirements.txt b/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 \
diff --git a/tests/address_bar_and_search/test_adaptive_history_autofill.py b/tests/address_bar_and_search/test_adaptive_history_autofill.py
@@ -0,0 +1,67 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from modules.browser_object import Navigation
+from modules.browser_object_tabbar import TabBar
+
+
+@pytest.fixture()
+def add_prefs():
+    return [
+        ("browser.search.region", "US"),
+        ("browser.urlbar.autoFill.adaptiveHistory.enabled", True),
+    ]
+
+
+def test_add_adaptive_history_autofill(driver: Firefox):
+    """
+    C1814373 - Test to verify that typing the first three characters of a previously visited URL in the address bar
+    triggers the adaptive history autofill.
+    """
+
+    nav = Navigation(driver).open()
+    tabs = TabBar(driver)
+
+    nav.search("https://www.nationalgeographic.com/science/")
+    WebDriverWait(driver, 10).until(
+        lambda d: tabs.get_tab_title(tabs.get_tab(1)) == "Science"
+    )
+
+    tabs.new_tab_by_button()
+    tabs.wait_for_num_tabs(2)
+    driver.switch_to.window(driver.window_handles[1])
+
+    with driver.context(driver.CONTEXT_CHROME):
+        x_icon = tabs.get_element("tab-x-icon", multiple=True)
+        x_icon[0].click()
+
+    # Type the first 3 characters of the visited URL in the address bar and select the suggested URL
+    nav.type_in_awesome_bar("nat")
+    nav.get_element("firefox-suggest").click()
+    nav.expect_in_content(
+        EC.url_contains("https://www.nationalgeographic.com/science/")
+    )
+
+    tabs.set_content_context()
+
+    # Open a new tab, type the first 3 characters of the visited URL
+    tabs.new_tab_by_button()
+    tabs.wait_for_num_tabs(2)
+    driver.switch_to.window(driver.window_handles[-1])
+    nav.type_in_awesome_bar("nat")
+
+    autofill_adaptive_element = nav.get_element(
+        "search-result-autofill-adaptive-element"
+    )
+
+    # Assertion to verify that the 'autofill_adaptive' type is found
+    assert (
+        autofill_adaptive_element.get_attribute("type") == "autofill_adaptive"
+    ), f"Expected element type to be 'autofill_adaptive' but found '{autofill_adaptive_element.get_attribute('type')}'"
+
+    # Assertion to check the autofilled URL is the expected one
+    assert (
+        "nationalgeographic.com/science" in autofill_adaptive_element.text
+    ), "URL 'https://www.nationalgeographic.com/science' not found in autofill suggestions."
diff --git a/tests/address_bar_and_search/test_default_search_provider_change.py b/tests/address_bar_and_search/test_default_search_provider_change.py
@@ -0,0 +1,72 @@
+from time import sleep
+
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from modules.browser_object import Navigation
+from modules.browser_object_context_menu import ContextMenu
+from modules.page_object import AboutConfig, AboutPrefs
+
+
+@pytest.fixture()
+def add_prefs():
+    return [
+        ("browser.search.region", "US"),
+    ]
+
+
+def test_default_search_provider_change(driver: Firefox):
+    """
+    C1365245 - This test makes sure that the default search
+    provider can be changed and settings are applied
+    """
+
+    # Create objects
+    nav = Navigation(driver).open()
+    about_config = AboutConfig(driver)
+    search_term = "what is life?"
+
+    # enable search bar via about:config
+    pref = "browser.search.widget.inNavBar"
+    about_config.toggle_true_false_config(pref)
+    nav.clear_awesome_bar()
+    nav.set_content_context()
+    sleep(1)
+
+    # type some word->select 'Change search settings' when the search drop-down panel is opened.
+
+    nav.type_in_search_bar(search_term)
+    nav.click_on_change_search_settings_button()
+
+    # switch to the second tab
+    driver.switch_to.window(driver.window_handles[1])
+    sleep(1)
+
+    # check that the current URL is about:preferences#search
+    assert driver.current_url == "about:preferences#search"
+
+    # open a site, open search settings again and check if it's opened in a different tab
+    driver.get("https://9gag.com/")
+    nav.type_in_search_bar(search_term)
+    nav.click_on_change_search_settings_button()
+    assert driver.current_url == "https://9gag.com/"
+
+    driver.switch_to.window(driver.window_handles[2])
+    assert driver.current_url == "about:preferences#search"
+
+    # Set a different provider as a default search engine
+    about_prefs = AboutPrefs(driver, category="search").open()
+    about_prefs.search_engine_dropdown().select_option("DuckDuckGo")
+
+    # Open the search bar and type in a keyword and check if it's with the right provider
+    nav.type_in_search_bar(search_term)
+    with driver.context(driver.CONTEXT_CHROME):
+        search_engine_name_element = driver.find_element(
+            By.CSS_SELECTOR, ".searchbar-engine-name"
+        )
+
+        assert search_engine_name_element.get_attribute("value") == "DuckDuckGo Search"
diff --git a/tests/address_bar_and_search/test_intervention_card_refresh_firefox.py b/tests/address_bar_and_search/test_intervention_card_refresh_firefox.py
diff --git a/tests/sync_and_fxa/conftest.py b/tests/sync_and_fxa/conftest.py
diff --git a/tests/sync_and_fxa/test_existing_fxa.py b/tests/sync_and_fxa/test_existing_fxa.py
diff --git a/tests/sync_and_fxa/test_new_fxa.py b/tests/sync_and_fxa/test_new_fxa.py
diff --git a/tests/theme_and_toolbar/test_customize_themes_and_redirect.py b/tests/theme_and_toolbar/test_customize_themes_and_redirect.py
