Added BOM for expect text in page title. Also cleaned up all the other tests to use the new method

Author: Tracy-Walker

modules/browser_object_tabbar.py

@@ -106,6 +106,13 @@ def expect_tab_sound_status(
             )
         return self
 
+    def expect_title_contains(self, text: str) -> BasePage:
+        """
+        Check if the page title contains given text
+        """
+        self.expect(EC.title_contains(text))
+        return self
+
     def open_all_tabs_list(self) -> BasePage:
         """Click the Tab Visibility / List All Tabs button"""
         with self.driver.context(self.driver.CONTEXT_CHROME):

tests/address_bar_and_search/test_search_bar_result.py

@@ -1,9 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
 
-from modules.browser_object import Navigation
+from modules.browser_object import Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -14,6 +13,11 @@ def add_prefs():
     ]
 
 
+# Set constants
+SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
+SEARCH_TERM = "saxophone"
+
+
 def test_search_bar_results(driver: Firefox):
     """
     C1365213 - The Search Bar provides valid results for specific search terms
@@ -22,21 +26,19 @@ def test_search_bar_results(driver: Firefox):
     # Create objects
     nav = Navigation(driver).open()
     ac = AboutConfig(driver)
-
-    search_term = "saxophone"
+    tab = TabBar(driver)
 
     # Check Google results from a Search bar search
     # First enable search bar via about:config
-    pref = "browser.search.widget.inNavBar"
-    ac.toggle_true_false_config(pref)
+    ac.toggle_true_false_config(SEARCH_BAR_PREF)
     nav.clear_awesome_bar()
 
     # Then run search and check the results
-    nav.search_bar_search(search_term)
+    nav.search_bar_search(SEARCH_TERM)
     nav.set_content_context()
-    nav.expect_in_content(EC.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_url = driver.current_url
-    assert search_term in search_url
+    assert SEARCH_TERM in search_url
     content_searchbar = nav.find_element(By.NAME, "q")
     content_searchbar_text = content_searchbar.get_attribute("value")
-    assert content_searchbar_text == search_term
+    assert content_searchbar_text == SEARCH_TERM

tests/address_bar_and_search/test_search_code_google_non_us.py

@@ -3,7 +3,7 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as ec
 
-from modules.browser_object import ContextMenu, Navigation
+from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -15,6 +15,10 @@ def add_prefs():
     ]
 
 
+# Set constant
+FX_SEARCH_CODE = "client=firefox-b-d"
+
+
 def test_search_code_google_us(driver: Firefox):
     """
     C1365269 - Default Search Code: Google - non-US
@@ -26,18 +30,18 @@ def test_search_code_google_us(driver: Firefox):
     nav = Navigation(driver).open()
     ac = AboutConfig(driver)
     context_menu = ContextMenu(driver)
+    tab = TabBar(driver)
 
     def search_code_assert():
         # Function to check the search code of a Google search in US region
-        fx_code = "client=firefox-b-d"
         nav.set_content_context()
         search_url = driver.current_url
-        assert fx_code in search_url
+        assert FX_SEARCH_CODE in search_url
         nav.clear_awesome_bar()
 
     # Check code generated from the Awesome bar search
     nav.search("soccer")
-    nav.expect(ec.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()
 
     # Check code generated from the Search bar search
@@ -48,7 +52,7 @@ def search_code_assert():
 
     # Then run the code check
     nav.search_bar_search("soccer")
-    nav.expect(ec.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()
 
     # Check code generated from the context click of selected text
@@ -64,5 +68,5 @@ def search_code_assert():
     # Switch to the newly opened tab and run the code check
     window_handles = driver.window_handles
     driver.switch_to.window(window_handles[-1])
-    nav.expect(ec.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()

tests/address_bar_and_search/test_search_code_google_us.py

@@ -3,7 +3,7 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
-from modules.browser_object import ContextMenu, Navigation
+from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -15,6 +15,10 @@ def add_prefs():
     ]
 
 
+# Set constant
+FX_SEARCH_CODE = "client=firefox-b-1-d"
+
+
 def test_search_code_google_us(driver: Firefox):
     """
     C1365268 - Default Search Code: Google - US
@@ -26,13 +30,13 @@ def test_search_code_google_us(driver: Firefox):
     nav = Navigation(driver).open()
     ac = AboutConfig(driver)
     context_menu = ContextMenu(driver)
+    tab = TabBar(driver)
 
     def search_code_assert():
         # Function to check the search code of a Google search in US region
-        fx_code = "client=firefox-b-1-d"
         nav.set_content_context()
         search_url = driver.current_url
-        assert fx_code in search_url
+        assert FX_SEARCH_CODE in search_url
         nav.clear_awesome_bar()
 
     # Check code generated from the Awesome bar search
@@ -48,7 +52,7 @@ def search_code_assert():
 
     # Then run the code check
     nav.search_bar_search("soccer")
-    nav.expect(EC.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()
 
     # Check code generated from the context click of selected text
@@ -64,5 +68,5 @@ def search_code_assert():
     # Switch to the newly opened tab and run the code check
     window_handles = driver.window_handles
     driver.switch_to.window(window_handles[-1])
-    nav.expect(EC.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()

tests/address_bar_and_search/test_search_term_persists.py

@@ -1,9 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.support import expected_conditions as EC
 
-from modules.browser_object import Navigation
-from modules.browser_object_tabbar import TabBar
+from modules.browser_object import Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -17,6 +15,13 @@ def add_prefs():
     ]
 
 
+# Set constants
+FIRST_SEARCH = "cheetah"
+FIRST_RESULT = "https://www.google.com/search?client=firefox-b-1-d&q=cheetah"
+SECOND_SEARCH = "lion"
+SECOND_RESULT = "https://www.google.com/search?client=firefox-b-1-d&q=lion"
+
+
 def test_search_term_persists(driver: Firefox):
     """
     C2153943 - Persist search term basic functionality
@@ -26,12 +31,6 @@ def test_search_term_persists(driver: Firefox):
     nav = Navigation(driver).open()
     tab = TabBar(driver)
 
-    # Set values
-    search1 = "cheetah"
-    result1 = "https://www.google.com/search?client=firefox-b-1-d&q=cheetah"
-    search2 = "lion"
-    result2 = "https://www.google.com/search?client=firefox-b-1-d&q=lion"
-
     def toggle_old_search_bar():
         tab.new_tab_by_button()
         window_handles = driver.window_handles
@@ -45,41 +44,37 @@ def toggle_old_search_bar():
         driver.switch_to.window(window_handles[0])
 
     # Perform a search using the URL bar.
-    nav.search(search1)
-    nav.expect(EC.title_contains("Google Search"))
+    nav.search(FIRST_SEARCH)
+    tab.expect_title_contains("Google Search")
     nav.set_chrome_context()
     address_bar_text = nav.get_element("awesome-bar").get_attribute("value")
-    print("address bar value: ", address_bar_text)
-    assert search1 == address_bar_text
+    assert FIRST_SEARCH == address_bar_text
 
     # Add the search bar to toolbar
     toggle_old_search_bar()
 
     # Search term should be replaced with full url
     address_bar_text = nav.get_element("awesome-bar").get_attribute("value")
-    print("address bar value: ", address_bar_text)
-    assert result1 == address_bar_text
+    assert FIRST_RESULT == address_bar_text
     nav.clear_awesome_bar()
 
     # Perform a new awesome bar search, full url should be present
     # First, navigate away from Google
     nav.set_content_context()
     driver.get("about:robots")
     # Then perform another search
-    nav.search(search2)
-    nav.expect(EC.title_contains("Google Search"))
+    nav.search(SECOND_SEARCH)
+    tab.expect_title_contains("Google Search")
     nav.set_chrome_context()
     address_bar_text = nav.get_element("awesome-bar").get_attribute("value")
-    print("address bar value: ", address_bar_text)
-    assert result2 == address_bar_text
+    assert SECOND_RESULT == address_bar_text
 
     # Disable the old search bar
     toggle_old_search_bar()
 
     # Again, perform a search using the URL bar.
-    nav.search(search1)
-    nav.expect(EC.title_contains("Google Search"))
+    nav.search(FIRST_SEARCH)
+    tab.expect_title_contains("Google Search")
     nav.set_chrome_context()
     address_bar_text = nav.get_element("awesome-bar").get_attribute("value")
-    print("address bar value: ", address_bar_text)
-    assert search1 == address_bar_text
+    assert FIRST_SEARCH == address_bar_text