Merge pull request #166 from mozilla/tw/legacy_search_test_refactor

Remove usages of legacy search bar

Author: Tracy-Walker

tests/address_bar_and_search/test_search_bar_result.py

@@ -16,21 +16,16 @@ def overwrite_prefs():
 
 # Set constants
 FX_SEARCH_CODE = "client=firefox-b-d"
-SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
 
 
-# NOTE: Need to fix, failing in 130+ Firefox due to legacy search bar being deprecated
-@pytest.mark.unstable
 def test_search_code_google_non_us(driver: Firefox):
     """
     C1365269 - Default Search Code: Google - non-US
-    This tests multiple ways of sending a search; Awesome bar,
-    Search bar and selected text
+    This tests searching via Awesomebar and selected text
     """
 
     # Create objects
     nav = Navigation(driver).open()
-    ac = AboutConfig(driver)
     context_menu = ContextMenu(driver)
     tab = TabBar(driver)
     example = ExamplePage(driver)
@@ -47,16 +42,6 @@ def search_code_assert():
     tab.expect_title_contains("Google Search")
     search_code_assert()
 
-    # Check code generated from the Search bar search
-    # First enable search bar via about:config
-    ac.toggle_true_false_config(SEARCH_BAR_PREF)
-    nav.clear_awesome_bar()
-
-    # Then run the code check
-    nav.search_bar_search("soccer")
-    tab.expect_title_contains("Google Search")
-    search_code_assert()
-
     # Check code generated from the context click of selected text
     with driver.context(driver.CONTEXT_CONTENT):
         example.open()

tests/address_bar_and_search/test_search_code_google_non_us.py

@@ -1,4 +1,3 @@
-import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
 
@@ -7,20 +6,16 @@
 
 # Set constant
 FX_SEARCH_CODE = "client=firefox-b-1-d"
-SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
 
 
-@pytest.mark.unstable
 def test_search_code_google_us(driver: Firefox):
     """
     C1365268 - Default Search Code: Google - US
-    This tests multiple ways of sending a search; Awesome bar,
-    Search bar and selected text
+    This tests searching via Awesomebar and selected text
     """
 
     # Create objects
     nav = Navigation(driver).open()
-    ac = AboutConfig(driver)
     context_menu = ContextMenu(driver)
     tab = TabBar(driver)
     example = ExamplePage(driver)
@@ -37,16 +32,6 @@ def search_code_assert():
     tab.expect_title_contains("Google Search")
     search_code_assert()
 
-    # Check code generated from the Search bar search
-    # First enable search bar via about:config
-    ac.toggle_true_false_config(SEARCH_BAR_PREF)
-    nav.clear_awesome_bar()
-
-    # Then run the code check
-    nav.search_bar_search("soccer")
-    tab.expect_title_contains("Google Search")
-    search_code_assert()
-
     # Check code generated from the context click of selected text
     with driver.context(driver.CONTEXT_CONTENT):
         example.open()

tests/address_bar_and_search/test_search_code_google_us.py

@@ -18,12 +18,8 @@ def add_prefs():
 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"
-SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
 
 
-# NOTE: Need to fix, failing in 130+ Firefox due to legacy search bar being deprecated
-@pytest.mark.unstable
 def test_search_term_persists(driver: Firefox):
     """
     C2153943 - Persist search term basic functionality
@@ -33,35 +29,13 @@ def test_search_term_persists(driver: Firefox):
     nav = Navigation(driver).open()
     tab = TabBar(driver)
 
-    def toggle_legacy_search_bar():
-        # This test requires that the old search bar is added while retaining search results.
-        # First, open a new tab and switch to it
-        tab.new_tab_by_button()
-        window_handles = driver.window_handles
-        driver.switch_to.window(window_handles[-1])
-        # Then, toggle the old search bar via about:config
-        ac = AboutConfig(driver)
-        ac.toggle_true_false_config(SEARCH_BAR_PREF)
-        # Finally, close the about:config tab and switch context back to the original tab
-        nav.set_chrome_context()
-        x_icon = tab.get_element("tab-x-icon", multiple=True)
-        x_icon[1].click()
-        driver.switch_to.window(window_handles[0])
 
     # Perform a search using the URL bar.
     nav.search(FIRST_SEARCH)
     tab.expect_title_contains("Google Search")
     address_bar_text = nav.get_awesome_bar_text()
     assert FIRST_SEARCH == address_bar_text
 
-    # Add the search bar to toolbar
-    toggle_legacy_search_bar()
-
-    # Search term should be replaced with full url
-    address_bar_text = nav.get_awesome_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()
@@ -70,13 +44,4 @@ def toggle_legacy_search_bar():
     nav.search(SECOND_SEARCH)
     tab.expect_title_contains("Google Search")
     address_bar_text = nav.get_awesome_bar_text()
-    assert SECOND_RESULT == address_bar_text
-
-    # Disable the old search bar
-    toggle_legacy_search_bar()
-
-    # Again, perform a search using the URL bar.
-    nav.search(FIRST_SEARCH)
-    tab.expect_title_contains("Google Search")
-    address_bar_text = nav.get_awesome_bar_text()
-    assert FIRST_SEARCH == address_bar_text
+    assert SECOND_SEARCH == address_bar_text