Merge pull request #589 from mozilla/tracy/re-enable-search-code-tests

Re-enable search code tests

Author: Tracy-Walker

modules/browser_object_navigation.py

@@ -400,4 +400,6 @@ def confirm_bookmark_exists(self, match_string: str) -> BasePage:
     @BasePage.context_chrome
     def get_legacy_search_engine_label(self) -> str:
         """Return the displayed engine name from the legacy search bar."""
-        return self.driver.find_element(By.CSS_SELECTOR, ".searchbar-engine-name").get_attribute("value")
+        return self.driver.find_element(
+            By.CSS_SELECTOR, ".searchbar-engine-name"
+        ).get_attribute("value")

modules/page_base.py

@@ -255,7 +255,7 @@ def get_selector(self, name: str, labels=[]) -> list:
         return selector
 
     def get_element(
-            self, name: str, multiple=False, parent_element=None, labels=[]
+        self, name: str, multiple=False, parent_element=None, labels=[]
     ) -> Union[list[WebElement], WebElement]:
         """
         Given a key for a self.elements dict entry, return the Selenium WebElement(s).
@@ -377,7 +377,7 @@ def get_elements(self, name: str, labels=[]):
         return self.get_element(name, multiple=True, labels=labels)
 
     def get_parent_of(
-            self, reference: Union[str, tuple, WebElement], labels=[]
+        self, reference: Union[str, tuple, WebElement], labels=[]
     ) -> WebElement:
         """
         Given a name + labels, a WebElement, or a tuple, return the direct parent node of the element.
@@ -400,15 +400,15 @@ def element_visible(self, name: str, labels=[]) -> Page:
         """Expect helper: wait until element is visible or timeout"""
         self.expect(
             lambda _: self.get_element(name, labels=labels)
-                      and self.get_element(name, labels=labels).is_displayed()
+            and self.get_element(name, labels=labels).is_displayed()
         )
         return self
 
     def element_not_visible(self, name: str, labels=[]) -> Page:
         """Expect helper: wait until element is not visible or timeout"""
         self.expect(
             lambda _: self.get_elements(name, labels=labels) == []
-                      or not self.get_element(name, labels=labels).is_displayed()
+            or not self.get_element(name, labels=labels).is_displayed()
         )
         return self
 
@@ -422,7 +422,7 @@ def element_selected(self, name: str, labels=[]) -> Page:
         """Expect helper: wait until element is selected or timeout"""
         self.expect(
             lambda _: self.get_element(name, labels=labels)
-                      and self.get_element(name, labels=labels).is_selected()
+            and self.get_element(name, labels=labels).is_selected()
         )
         return self
 
@@ -432,13 +432,13 @@ def element_has_text(self, name: str, text: str, labels=[]) -> Page:
         return self
 
     def expect_element_attribute_contains(
-            self, name: str, attr_name: str, attr_value: Union[str, float, int], labels=[]
+        self, name: str, attr_name: str, attr_value: Union[str, float, int], labels=[]
     ) -> Page:
         """Expect helper: wait until element attribute contains certain value"""
         self.expect(
             lambda _: self.get_element(name, labels=labels)
-                      and str(attr_value)
-                      in self.get_element(name, labels=labels).get_attribute(attr_name)
+            and str(attr_value)
+            in self.get_element(name, labels=labels).get_attribute(attr_name)
         )
         return self
 
@@ -468,7 +468,7 @@ def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         return self
 
     def fill(
-            self, name: str, term: str, clear_first=True, press_enter=True, labels=[]
+        self, name: str, term: str, clear_first=True, press_enter=True, labels=[]
     ) -> Page:
         """
         Get a fillable element and fill it with text. Return self.
@@ -527,7 +527,7 @@ def click_on(self, reference: Union[str, tuple, WebElement], labels=[]) -> Page:
         return self
 
     def multi_click(
-            self, iters: int, reference: Union[str, tuple, WebElement], labels=[]
+        self, iters: int, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """Perform multiple clicks at once on an element by name, selector, or WebElement"""
         with self.driver.context(self.context_id):
@@ -559,7 +559,7 @@ def triple_click(self, reference: Union[str, tuple, WebElement], labels=[]) -> P
         return self.multi_click(3, reference, labels)
 
     def context_click(
-            self, reference: Union[str, tuple, WebElement], labels=[]
+        self, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """Context (right-) click on an element"""
         with self.driver.context(self.context_id):
@@ -595,7 +595,7 @@ def undo(self) -> Page:
         return self
 
     def paste_to_element(
-            self, sys_platform, reference: Union[str, tuple, WebElement], labels=[]
+        self, sys_platform, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """Paste the copied item into the element"""
         with self.driver.context(self.context_id):
@@ -608,7 +608,7 @@ def paste_to_element(
         return self
 
     def copy_image_from_element(
-            self, keyboard, reference: Union[str, tuple, WebElement], labels=[]
+        self, keyboard, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """Copy from the given element using right click (pynput)"""
         with self.driver.context(self.context_id):
@@ -623,7 +623,7 @@ def copy_image_from_element(
         return self
 
     def copy_selection(
-            self, keyboard, reference: Union[str, tuple, WebElement], labels=[]
+        self, keyboard, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """Copy from the current selection using right click (pynput)"""
         with self.driver.context(self.context_id):
@@ -636,7 +636,7 @@ def copy_selection(
         return self
 
     def click_and_hide_menu(
-            self, reference: Union[str, tuple, WebElement], labels=[]
+        self, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """Click an option in a context menu, then hide it"""
         with self.driver.context(self.driver.CONTEXT_CHROME):
@@ -667,7 +667,7 @@ def scroll_to_element(self, reference: Union[str, tuple, WebElement], labels=[])
         return self
 
     def get_all_children(
-            self, reference: Union[str, tuple, WebElement], labels=[]
+        self, reference: Union[str, tuple, WebElement], labels=[]
     ) -> List[WebElement]:
         """
         Gets all the children of a webelement
@@ -679,7 +679,7 @@ def get_all_children(
         return children
 
     def wait_for_no_children(
-            self, parent: Union[str, tuple, WebElement], labels=[]
+        self, parent: Union[str, tuple, WebElement], labels=[]
     ) -> Page:
         """
         Waits for 0 children under the given parent, the wait is instant (note, this changes the driver implicit wait and changes it back)
@@ -840,7 +840,7 @@ def handle_os_download_confirmation(self, keyboard: Controller, sys_platform: st
         keyboard.release(Key.enter)
 
     def hide_popup_by_child_node(
-            self, reference: Union[str, tuple, WebElement], labels=[], retry=False
+        self, reference: Union[str, tuple, WebElement], labels=[], retry=False
     ) -> Page:
         try:
             with self.driver.context(self.context_id):

test_local_executables_updated.py

@@ -41,7 +41,7 @@ def test_local_executables_updated(driver: Firefox, version):
         print("You are not running the latest geckodriver version!!!")
         print(f"Latest version is {latest_gd_ver} but you are running {local_gd_ver}")
         raise RuntimeError(
-            f"Update geckodriver here: https://github.com/mozilla/geckodriver/releases/"
+            "Update geckodriver here: https://github.com/mozilla/geckodriver/releases/"
         )
 
 

tests/address_bar_and_search/test_default_search_provider_change_awesome_bar.py

@@ -31,4 +31,6 @@ def test_default_search_provider_change_awesome_bar(driver: Firefox):
 
     # Step 3: Re-open new tab and verify placeholder
     driver.get("about:newtab")
-    nav.expect_element_attribute_contains("awesome-bar", "placeholder", EXPECTED_PLACEHOLDER)
+    nav.expect_element_attribute_contains(
+        "awesome-bar", "placeholder", EXPECTED_PLACEHOLDER
+    )

tests/address_bar_and_search/test_google_withads_url_bar_us.py

@@ -1,8 +1,9 @@
 import sys
 from os import environ
-import pytest
 from time import sleep
 
+import pytest
+
 from modules.browser_object import Navigation
 from modules.page_object import AboutTelemetry
 from modules.util import Utilities
@@ -59,4 +60,6 @@ def test_google_withads_url_bar_us(driver):
             sleep(2)
             driver.get("about:newtab")
         else:
-            pytest.fail(f"Telemetry path {path} not found after {max_attempts} attempts.")
+            pytest.fail(
+                f"Telemetry path {path} not found after {max_attempts} attempts."
+            )

tests/address_bar_and_search/test_refresh_firefox_dialog.py

@@ -12,6 +12,7 @@
 def test_case():
     return "3028765"
 
+
 def test_refresh_firefox_dialog(driver: Firefox):
     """
     C2914620 - Verify that the 'Refresh Firefox' dialog appears from the address bar.

tests/address_bar_and_search/test_search_code_google_non_us.py

@@ -5,9 +5,9 @@
 from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import ExamplePage
 
-FX_SEARCH_CODE = "client=firefox-b-d"
+FX_SEARCH_CODE = "client%3Dfirefox-b-d"
 SEARCH_TERM = "soccer"
-EXPECTED_TITLE = "Google Search"
+EXPECTED_TITLE = "google.com"
 
 
 @pytest.fixture()
@@ -23,7 +23,6 @@ def add_to_prefs_list():
     ]
 
 
-@pytest.mark.unstable(reason="Google re-captcha")
 def test_search_code_google_non_us(driver: Firefox):
     """
     C1365269 - Default Search Code: Google - non-US.

tests/address_bar_and_search/test_search_code_google_us.py

@@ -4,10 +4,11 @@
 from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import ExamplePage
 
-EXPECTED_TITLE = "Google Search"
-FX_SEARCH_CODE = "client=firefox-b-1-d"
+EXPECTED_TITLE = "google.com"
+FX_SEARCH_CODE = "client%3Dfirefox-b-1-d"
 SEARCH_TERM = "soccer"
 
+
 @pytest.fixture()
 def test_case():
     return "3029765"
@@ -18,7 +19,6 @@ def add_to_prefs_list():
     return [("cookiebanners.service.mode", 1)]
 
 
-@pytest.mark.unstable(reason="Google re-captcha")
 def test_search_code_google_us(driver: Firefox):
     """
     C1365268 - Default Search Code: Google - US