vs/add-to-navigation

Author: vsangereanMOZ

manifests/incident.yaml

@@ -12,7 +12,6 @@ address_bar_and_search:
 - test_search_term_persists
 - test_server_not_found_error
 - test_suggestion_engine_selection
-- test_switch_to_existing_tab_when_having_the_same_URL
 audio_video:
 - test_allow_audio_video_functionality
 - test_block_audio_video_functionality

manifests/smoke.yaml

@@ -33,7 +33,6 @@ address_bar_and_search:
 - test_server_not_found_error
 - test_server_not_found_error_pb
 - test_suggestion_engine_selection
-- test_switch_to_existing_tab_when_having_the_same_URL
 - test_tile_menu_options
 audio_video:
 - test_allow_audio_video_functionality

modules/browser_object_navigation.py

@@ -123,6 +123,24 @@ def click_firefox_suggest(self) -> None:
         """Click the Firefox suggested result."""
         self.get_element("firefox-suggest").click()
 
+    def click_switch_to_tab(self) -> None:
+        """
+        Clicks the 'Switch to Tab' suggestion in the URL bar results.
+        Assumes the caller already typed into the awesome bar.
+
+        This uses a minimal wait that returns the list of matches only
+        when at least one element is found.
+        """
+
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            # Wait until at least one switch-to-tab result is present
+            switch_items = self.wait.until(
+                lambda d: self.get_elements("switch-to-tab") or None
+            )
+
+            # Click the first matching row
+            switch_items[0].click()
+
     @BasePage.context_chrome
     def search(self, term: str, mode=None) -> BasePage:
         """

tests/address_bar_and_search/test_switch_to_existing_tab_when_having_the_same_URL.py

@@ -13,7 +13,6 @@ def test_case():
     return "3028949"
 
 
-@pytest.mark.functional
 def test_switch_to_existing_tab_when_having_the_same_URL(driver: Firefox):
     """
     3028949 - Handle switch to tab functionality
@@ -33,17 +32,15 @@ def test_switch_to_existing_tab_when_having_the_same_URL(driver: Firefox):
     nav.clear_awesome_bar()
     nav.type_in_awesome_bar(SITE_HOST)
 
-    # Step 4–5: Find AND CLICK "Switch to Tab" in chrome context
-    with driver.context(driver.CONTEXT_CHROME):
-        nav.wait.until(lambda d: len(nav.get_elements("switch-to-tab")) > 0)
-        switch_row = nav.get_elements("switch-to-tab")[0]
-        switch_row.click()
+    # Step 4: Click "Switch to Tab" suggestion
+    nav.click_switch_to_tab()
 
-    # Step 6: After clicking, the new tab's context is discarded.
-    # Re-attach to the remaining tab and assert we only have one.
+    # Step 5: Wait until only one tab remains
     tabs.wait_for_num_tabs(1)
-    remaining_handles = driver.window_handles
-    assert len(remaining_handles) == 1
 
-    driver.switch_to.window(remaining_handles[0])
+    # Step 6: Reattach driver to the remaining tab
+    handle = driver.window_handles[0]
+    driver.switch_to.window(handle)
+
+    # Step 7: Verify the remaining tab is the original TEST_URL
     assert TEST_URL in driver.current_url