Merge branch 'main' into as/cc-dropdown

Author: soncuteanca

modules/browser_object_navigation.py

@@ -22,6 +22,14 @@ class Navigation(BasePage):
         "History": "^",
         "Actions": ">",
     }
+    VALID_SEARCH_MODES = {
+        "Google",
+        "eBay",
+        "Amazon.com",
+        "Bing",
+        "DuckDuckGo",
+        "Wikipedia (en)",
+    }
 
     def expect_in_content(self, condition) -> BasePage:
         """Like BasePage.expect, but guarantee we're looking at CONTEXT_CONTENT"""
@@ -171,6 +179,36 @@ def click_in_awesome_bar(self) -> BasePage:
         self.awesome_bar.click()
         return self
 
+    def click_search_mode_switcher(self) -> BasePage:
+        """
+        click search mode switcher
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.search_mode_switcher = self.get_element("searchmode-switcher")
+            self.search_mode_switcher.click()
+        return self
+
+    def set_search_mode(self, search_mode: str) -> BasePage:
+        """
+        set new search location if search_mode in VALID_SEARCH_MODES
+
+        Parameter:
+            search_mode (str): search mode to be selected
+
+        Raises:
+            StopIteration: if a valid search mode is not found in the list of valid elements.
+        """
+        # check if search_mode is valid, otherwise raise error.
+        if search_mode not in self.VALID_SEARCH_MODES:
+            raise ValueError("search location is not valid.")
+        # switch to chrome context
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            # get list of all valid search modes and filter by label
+            self.get_element(
+                "search-mode-switcher-option", labels=[search_mode]
+            ).click()
+            return self
+
     def context_click_in_awesome_bar(self) -> BasePage:
         self.set_awesome_bar()
         actions = ActionChains(self.driver)

modules/data/navigation.components.json

@@ -322,7 +322,6 @@
         "strategy": "id",
         "groups": []
     },
-
     "bookmarks-type-dropdown": {
         "selectorData": "editBMPanel_folderMenuList",
         "strategy": "id",
@@ -569,7 +568,6 @@
     "searchmode-switcher-settings": {
         "selectorData": "searchmode-switcher-popup-search-settings-button",
         "strategy": "id",
-
         "groups": []
     },
 

modules/page_object_prefs.py

@@ -394,11 +394,12 @@ def click_popup_panel_button(self, field: str) -> BasePage:
             self.get_element("panel-popup-button", labels=[field]).click()
         return self
 
-    def select_https_only_setting(self, option_id: HttpsOnlyStatus) -> BasePage:
+    def select_https_only_setting(self, option_id: "HttpsOnlyStatus") -> BasePage:
         """
         Click the HTTPS Only option given
         """
         self.find_in_settings("HTTPS")
+        self.element_clickable(option_id)
         self.click_on(option_id)
         self.element_attribute_contains(option_id, "checked", "")
         return self

tests/address_bar_and_search/test_search_engine_selector.py

@@ -0,0 +1,32 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.support import expected_conditions as EC
+
+from modules.browser_object import Navigation
+
+
+@pytest.fixture()
+def test_case():
+    return "1365151"
+
+
+@pytest.mark.parametrize(
+    "search_mode",
+    ["Google", "eBay", "Bing", "DuckDuckGo", "Wikipedia (en)", "Amazon.com"],
+)
+def test_search_engine_selector_and_validator(driver: Firefox, search_mode: str):
+    """
+    Select Appropriate search engine and go to site, asserting that the correct search engine was used.
+
+    Parameters:
+        driver (FireFox): webdriver used for communicating with the browser.
+        search_mode (str): search parameter selected from the awesome bar.
+    """
+    nav = Navigation(driver)
+    url_element_search_mode = search_mode.split()[0].lower()
+    nav.click_search_mode_switcher()
+    nav.set_search_mode(search_mode)
+    nav.search("soccer")
+    nav.expect_in_content(EC.url_contains(url_element_search_mode))
+    assert url_element_search_mode in driver.current_url
+    nav.clear_awesome_bar()

tests/scrolling_panning_zooming/test_zoom_text_only.py

@@ -41,6 +41,7 @@ def temp_selectors():
 
 
 @pytest.mark.ci
+@pytest.mark.unstable
 def test_zoom_text_only_from_settings(driver: Firefox, temp_selectors):
     """
     C545733.1: Verify that ticking the zoom text only box would only affect the scale of text.
@@ -74,6 +75,7 @@ def test_zoom_text_only_from_settings(driver: Firefox, temp_selectors):
     about_prefs.click_on("zoom-text-only")
 
 
+@pytest.mark.unstable
 def test_zoom_text_only_after_restart(driver: Firefox, temp_selectors):
     """
     C545733.2: Verify that the zoom text only option works after restart

tests/security_and_privacy/conftest.py

@@ -14,6 +14,6 @@ def add_prefs():
 @pytest.fixture()
 def set_prefs(add_prefs: dict):
     """Set prefs"""
-    prefs = []
+    prefs = [("browser.urlbar.scotchBonnet.enableOverride", True)]
     prefs.extend(add_prefs)
     return prefs