finish undo close tab

Author: sarinali

modules/browser_object_tabbar.py

@@ -53,12 +53,29 @@ def new_tab_by_keys(self, sys_platform: str) -> BasePage:
             ).perform()
         return self
 
+    def reopen_closed_tab_by_keys(self, sys_platform: str) -> BasePage:
+        """Use keyboard shortcut to reopen a last closed tab"""
+        if sys_platform == "Darwin":
+            self.actions.key_down(Keys.COMMAND).key_down(Keys.SHIFT).send_keys(
+                "t"
+            ).key_up(Keys.SHIFT).key_up(Keys.COMMAND).perform()
+        else:
+            self.actions.key_down(Keys.CONTROL).key_down(Keys.SHIFT).send_keys(
+                "t"
+            ).key_up(Keys.SHIFT).key_up(Keys.CONTROL).perform()
+        return self
+
     def click_tab_by_title(self, title: str) -> BasePage:
         """Given a full page title, click the corresponding tab"""
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.get_element("tab-by-title", labels=[title]).click()
         return self
 
+    def get_tab_by_title(self, title: str) -> BasePage:
+        """Given a full page title, return the corresponding tab"""
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            return self.get_element("tab-by-title", labels=[title])
+
     def click_tab_by_index(self, index: int) -> BasePage:
         """Given a tab index (int), click the corresponding tab"""
         with self.driver.context(self.driver.CONTEXT_CHROME):
@@ -245,11 +262,11 @@ def get_bar_y():
             self.actions.release()
             self.actions.perform()
 
-    def close_tab_of_index(self, index: int) -> BasePage:
+    def close_tab(self, tab: WebElement) -> BasePage:
         """
         Given the index of the tab, it closes that tab.
         """
-        cur_tab = self.click_tab_by_index(index)
+        # cur_tab = self.click_tab_by_index(index)
         with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("tab-x-icon", parent_element=cur_tab).click()
+            self.get_element("tab-x-icon", parent_element=tab).click()
         return self

tests/security_and_privacy/test_undo_close_tab_private_browsing.py

@@ -1,39 +1,26 @@
-from time import sleep
-
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.common.keys import Keys
 
 from modules.browser_object import Navigation, PanelUi, TabBar
+from modules.page_object import GenericPage
 
 VISIT_URL = "about:about"
 
-links = [
-    "about:about",
-    "about:addons",
-    "about:cache",
-    "about:config",
-    "about:buildconfig",
-    "about:robots",
-    "about:blank",
-]
-
-link_set = set(links)
-
 
 @pytest.fixture()
 def add_prefs():
     return []
 
 
-def test_undo_close_tab_private_browsing(driver: Firefox):
+def test_undo_close_tab_private_browsing(driver: Firefox, sys_platform: str):
     """
     C120118: ensure that you can close a tab in private browsing window
     """
     # instantiate objs
-    panel_ui = PanelUi(driver)
-    nav = Navigation(driver).open()
+    panel_ui = PanelUi(driver).open()
+    nav = Navigation(driver)
     tabs = TabBar(driver)
+    generic_page = GenericPage(driver, url="about:about")
 
     # open a new private window and open a new tab
     panel_ui.open_private_window()
@@ -43,16 +30,24 @@ def test_undo_close_tab_private_browsing(driver: Firefox):
     tabs.new_tab_by_button()
     tabs.switch_to_new_tab()
 
-    # navigate to the URL NOTE: TEMPORARY GET AWESOME BAR PRIVATE. ADD SUPPORT FOR IT IN NAVIGATION
+    # navigate to the URL
     with driver.context(driver.CONTEXT_CHROME):
-        search_bar = nav.get_element("awesome-bar-private")
-        search_bar.send_keys(VISIT_URL + Keys.ENTER)
-    tabs.wait_for_num_tabs(3)
-    # tabs.switch_to_new_tab()
-    # for _ in range(100):
-    #     print(len(driver.window_handles))
-    #     sleep(0.5)
+        nav.search(VISIT_URL)
 
-    tabs.close_tab_of_index(0)
+    # ensure its loaded
+    generic_page.url_contains("about:about")
 
-    sleep(40)
+    # close the most recent window
+    with driver.context(driver.CONTEXT_CHROME):
+        cur_tab = tabs.get_tab_by_title("About About")
+        tabs.close_tab(cur_tab)
+
+    # ensuring that one of the tabs was closed properly
+    tabs.wait_for_num_tabs(2)
+    assert len(driver.window_handles) == 2
+
+    # ensure the last tab can be reopened
+    with driver.context(driver.CONTEXT_CHROME):
+        tabs.reopen_closed_tab_by_keys(sys_platform)
+        tabs.wait_for_num_tabs(2)
+        assert driver.title == "About About — Private Browsing"