Merge remote-tracking branch 'refs/remotes/origin/main' into hy/preferences_all_toggles_enabled

# Conflicts:
#	modules/data/navigation.components.json

Author: Hani Yacoub

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()

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.

modules/data/navigation.components.json

@@ -168,15 +168,21 @@
         "groups": []
     },
 
-    "sponsored-site-card": {
-        "selectorData": "top-site-outer",
-        "strategy": "class",
+    "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": []
     },
 
-    "firefox-suggest": {
-        "selectorData": "div[label='Firefox Suggest'] > span.urlbarView-row-inner, div[label='Firefox Suggest'] + div.urlbarView-row",
-        "strategy": "css",
+    "sponsored-site-card": {
+        "selectorData": "top-site-outer",
+        "strategy": "class",
         "groups": []
     },
 

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."

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"

tests/theme_and_toolbar/test_customize_themes_and_redirect.py

@@ -28,7 +28,7 @@ def test_redirect_to_addons(driver: Firefox):
 @pytest.mark.parametrize("theme_name", list(themes.keys()))
 def test_open_addons(driver: Firefox, theme_name: str):
     """
-    C118173, continutation ensures that all the themes are set correctly
+    C118173, continuation ensures that all the themes are set correctly
     """
     nav = Navigation(driver).open()
     abt_addons = AboutAddons(driver).open()