Merge pull request #120 from mozilla/sl/undo-close-tab-private-browsing

Undo Tab Close Private Browsing

Author: sarinali

modules/browser_object_panel_ui.py

@@ -132,3 +132,12 @@ def start_sync(self) -> BasePage:
             self.element_has_text("fxa-sync-label", "Sync now")
             self.get_element("fxa-sync-label").click()
         return self
+
+    def open_private_window(self) -> BasePage:
+        """
+        Opens a new window in private browsing mode using the panel
+        """
+        self.open_panel_menu()
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("panel-ui-new-private-window").click()
+        return self

modules/browser_object_tabbar.py

@@ -65,12 +65,29 @@ def new_window_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):
@@ -247,3 +264,12 @@ def scroll_on_all_tabs_menu(self, down=True, pixels=200) -> BasePage:
             self.actions.move_by_offset(0, (sign * pixels))
             self.actions.release()
             self.actions.perform()
+
+    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)
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("tab-x-icon", parent_element=tab).click()
+        return self

modules/data/panel_ui.components.json

@@ -119,6 +119,12 @@
         "selectorData": "toolbarbutton[class='restoreallitem subviewbutton panel-subview-footer-button']",
         "strategy": "css",
         "groups": []
+    },
+
+    "panel-ui-new-private-window": {
+        "selectorData": "appMenu-new-private-window-button2",
+        "strategy": "id",
+        "groups": []
     }
 
 }

modules/page_base.py

@@ -391,6 +391,11 @@ def url_contains(self, url_part: str) -> Page:
         self.expect(EC.url_contains(url_part))
         return self
 
+    def title_contains(self, url_part: str) -> Page:
+        """Expect helper: wait until driver URL contains given text or timeout"""
+        self.expect(EC.title_contains(url_part))
+        return self
+
     def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         """
         Given a part of a URL and a regex, wait for that substring to exist in
@@ -545,11 +550,13 @@ def switch_to_new_tab(self) -> Page:
 
     def wait_for_num_windows(self, num: int) -> Page:
         """Wait for the number of open tabs + windows to equal given int"""
-        return self.wait_for_num_tabs(num)
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            return self.wait_for_num_tabs(num)
 
     def switch_to_new_window(self) -> Page:
         """Switch to newest window"""
-        return self.switch_to_new_tab()
+        with self.driver.context(self.driver.CONTEXT_CONTENT):
+            return self.switch_to_new_tab()
 
     def hide_popup(self, context_menu: str, chrome=False) -> Page:
         """

tests/security_and_privacy/test_tls_v1_2_protocol.py

@@ -41,8 +41,10 @@ def test_tls_v1_2_protocol(driver: Firefox):
             EC.presence_of_element_located((By.ID, "security-technical-shortform"))
         )
 
-        expected_technical_details = ("Connection Encrypted (TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, 256 bit keys, "
-                                      "TLS 1.2)")
+        expected_technical_details = (
+            "Connection Encrypted (TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, 256 bit keys, "
+            "TLS 1.2)"
+        )
         assert (
             technical_details.get_attribute("value") == expected_technical_details
         ), f"Expected '{expected_technical_details}' but found '{technical_details.get_attribute('value')}'"

tests/security_and_privacy/test_undo_close_tab_private_browsing.py

@@ -0,0 +1,58 @@
+import logging
+
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import Navigation, PanelUi, TabBar
+from modules.page_object import GenericPage
+
+VISIT_URL = "about:about"
+
+
+@pytest.fixture()
+def add_prefs():
+    return []
+
+
+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).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()
+    tabs.switch_to_new_window()
+
+    # open a new tab
+    tabs.new_tab_by_button()
+    tabs.switch_to_new_tab()
+
+    # navigate to the URL
+    nav.search(VISIT_URL)
+
+    # ensure its loaded
+    generic_page.url_contains("about:about")
+
+    # close the most recent window
+    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)
+        tabs.switch_to_new_tab()
+        logging.info(f"The observed title in the chrome context is {driver.title}")
+        tabs.title_contains("Private Browsing")
+
+    logging.info(f"The observed title in the content context is {driver.title}")
+    generic_page.title_contains("About About")

tests/tabs/test_list_all_tabs.py

@@ -1,7 +1,5 @@
 import logging
-from time import sleep
 
-import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.keys import Keys
 

tests/tabs/test_navigation_multiple_tabs.py

@@ -1,6 +1,5 @@
 import logging
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import TabBar