Anca/ Add test restored closed tabs removed from all history entries (#1050)

* Add test restored closed tabs removed from all history entries

* Add test to key.manifest

* Revert to an earlier line

* Add hard sleep

* Remove duplication

Author: soncuteanca

manifests/key.yaml

@@ -1018,6 +1018,10 @@ session_restore:
     result: pass
     splits:
     - functional2
+  test_restored_closed_tabs_removed_from_all_history_entries:
+    result: pass
+    splits:
+    - functional2
 sync_and_fxa:
   test_existing_fxa:
     result: unstable

modules/browser_object_panel_ui.py

@@ -167,16 +167,12 @@ def redirect_to_about_logins_page(self) -> BasePage:
 
     @BasePage.context_chrome
     def reopen_recently_closed_tabs(self) -> BasePage:
-        """Reopen all recently closed tabs"""
+        """Navigate to Hamburger > History > Recently Closed Tabs subview."""
         self.open_panel_menu()
         self.click_on("panel-ui-history")
-
         self.click_on("panel-ui-history-recently-closed")
-        if self.sys_platform() in ("Linux", "Darwin"):
-            sleep(2)
-
+        sleep(2)
         self.click_on("panel-ui-history-recently-closed-reopen-tabs")
-
         return self
 
     # History
@@ -394,7 +390,29 @@ def unfocus_address_bar(self) -> None:
 
     @BasePage.context_chrome
     def reopen_all_recently_closed_tabs(self) -> BasePage:
-        """Reopen all recently closed tabs"""
+        """Reopen all recently closed tabs via Hamburger > History > Recently Closed."""
         self.reopen_recently_closed_tabs()
+        self.element_visible("reopen-all-closed-tabs-button")
         self.click_on("reopen-all-closed-tabs-button")
         return self
+
+    @BasePage.context_chrome
+    def get_recently_closed_tab_urls(self):
+        """Get URLs/labels of recently closed tabs from the Hamburger menu."""
+        self.reopen_recently_closed_tabs()
+        items = self.get_elements("bookmark-item")
+        urls = []
+        for item in items:
+            if item.is_displayed():
+                label = item.get_attribute("label") or ""
+                urls.append(label)
+        return urls
+
+    @BasePage.context_chrome
+    def verify_urls_not_in_recently_closed(self, urls: set[str]):
+        """Verify that the specified URLs are not in the recently closed tabs list."""
+        recently_closed = set(self.get_recently_closed_tab_urls())
+        found = urls.intersection(recently_closed)
+        assert len(found) == 0, (
+            f"Expected URLs to be removed from recently closed, but found: {found}"
+        )

modules/browser_object_tabbar.py

@@ -663,3 +663,14 @@ def verify_removed_tab_displayed_after_group(self, tab_index: int):
             f"Tab position: {tab_position}, Group end: {group_end_position}"
         )
         return self
+
+    def get_all_window_urls(self) -> set[str]:
+        """Get URLs from all open windows/tabs.
+        Iterates through all window handles and collects current URLs
+        """
+        urls = set()
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            for handle in self.driver.window_handles:
+                self.driver.switch_to.window(handle)
+                urls.add(self.driver.current_url)
+        return urls

modules/data/panel_ui.components.json

@@ -292,7 +292,7 @@
         "groups": []
     },
     "reopen-all-closed-tabs-button": {
-        "selectorData": "toolbarbutton[class='restoreallitem subviewbutton panel-subview-footer-button'][label='Reopen all tabs']",
+        "selectorData": "toolbarbutton.restoreallitem[label='Reopen all tabs']",
         "strategy": "css",
         "groups": []
     }

modules/page_object_firefox_view.py

@@ -62,3 +62,8 @@ def wait_for_closed_tabs_with_urls(self, expected_urls: set[str]) -> BasePage:
             lambda _: expected_urls.issubset(set(self.get_closed_tab_urls()))
         )
         return self
+
+    def wait_for_no_closed_tabs(self) -> BasePage:
+        """Wait until the Recently Closed section has no tab entries."""
+        self.wait.until(lambda _: len(self.get_closed_tab_urls()) == 0)
+        return self

tests/session_restore/test_restored_closed_tabs_removed_from_all_history_entries.py

@@ -0,0 +1,81 @@
+import platform
+
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import TabBar
+from modules.browser_object_panel_ui import PanelUi
+from modules.page_object_firefox_view import FirefoxView
+
+
+@pytest.fixture()
+def test_case():
+    return "2333482"
+
+
+URLS_TO_CLOSE = {
+    "window1": ["about:mozilla", "about:robots"],
+    "window2": ["about:logo", "about:license"],
+    "window3": ["about:buildconfig", "about:credits"],
+}
+ALL_CLOSED_URLS = set(sum(URLS_TO_CLOSE.values(), []))
+
+
+def test_restored_closed_tabs_removed_from_all_history_entries(driver: Firefox):
+    """
+    C2333482 - Verify that closed tabs from multiple windows can be restored via Hamburger Menu > History > Recently
+    Closed Tabs > Reopen All Tabs, and that they are removed from Firefox View, hamburger menu, and History menu bar.
+    """
+    # Initialize objects
+    tabs = TabBar(driver)
+    fx_view = FirefoxView(driver)
+    panel = PanelUi(driver)
+    main_window = driver.current_window_handle
+
+    # Helper method to open tabs in a new window and close them
+    def close_tabs_in_new_window(urls: list[str]):
+        """Open a new window, create tabs for URLs, then close them."""
+        driver.switch_to.window(main_window)
+        tabs.open_and_switch_to_new_window("window")
+        tabs.clear_cache()
+        tabs.open_urls_in_tabs(urls)
+        tabs.close_last_n_tabs(total_tabs=1 + len(urls), count=len(urls))
+
+    # Close tabs across multiple windows
+    tabs.open_urls_in_tabs(["about:about"] + URLS_TO_CLOSE["window1"])
+    tabs.close_last_n_tabs(total_tabs=4, count=2)  # leave one tab opened
+
+    close_tabs_in_new_window(URLS_TO_CLOSE["window2"])
+    close_tabs_in_new_window(URLS_TO_CLOSE["window3"])
+
+    # Verify closed tabs appear in Firefox View
+    driver.switch_to.window(main_window)
+    fx_view.open_recently_closed()
+    fx_view.wait_for_closed_tabs_with_urls(ALL_CLOSED_URLS)
+
+    # Restore all closed tabs via Panel UI (must navigate away from Firefox View first)
+    driver.get("about:blank")
+    panel.clear_cache()
+    panel.reopen_all_recently_closed_tabs()
+    tabs.custom_wait(timeout=30).until(
+        lambda _: ALL_CLOSED_URLS.issubset(tabs.get_all_window_urls())
+    )
+
+    # Verify all recently closed lists are now empty
+    # Verify Firefox View
+    driver.switch_to.window(main_window)
+    fx_view.clear_cache()
+    fx_view.open_recently_closed()
+    fx_view.wait_for_no_closed_tabs()
+
+    # Verify Panel UI
+    panel.verify_urls_not_in_recently_closed(ALL_CLOSED_URLS)
+
+    # Verify Menu Bar (not on macOS)
+    if platform.system() != "Darwin":
+        from modules.browser_object_menu_bar import MenuBar
+
+        menu_bar = MenuBar(driver)
+        assert len(menu_bar.get_recently_closed_urls()) == 0, (
+            "Expected no recently closed tabs in menu bar"
+        )