refactor more panel-needing tests

Author: ben-c-at-moz

modules/browser_object_panel_ui.py

@@ -274,3 +274,20 @@ def confirm_history_clear(self):
         self.expect_element_attribute_contains(
             "recent-history-content", "value", "(Empty)"
         )
+
+    @BasePage.context_chrome
+    def reopen_recently_closed_tabs(self) -> BasePage:
+        """Reopen all recently closed tabs"""
+        self.open_panel_menu()
+        # Bug 1974080
+        if self.sys_platform() == "Windows":
+            sleep(2)
+        self.click_on("panel-ui-history")
+
+        self.element_clickable("panel-ui-history-recently-closed")
+        self.click_on("panel-ui-history-recently-closed")
+
+        self.element_clickable("panel-ui-history-recently-closed-reopen-tabs")
+        self.click_on("panel-ui-history-recently-closed-reopen-tabs")
+
+        return self

tests/printing_ui/test_print_to_pdf.py

@@ -1,5 +1,6 @@
 import logging
 import os
+from platform import system
 
 import pytest
 from selenium.webdriver import Firefox
@@ -44,6 +45,7 @@ def file_is_somewhere():
     return False
 
 
+@pytest.mark.skipif(system().lower().startswith("win"), reason="Bug 1974011")
 @pytest.mark.headed
 def test_print_to_pdf(
     driver: Firefox,

tests/security_and_privacy/test_never_remember_browsing_history.py

@@ -71,26 +71,7 @@ def test_never_remember_browsing_history_from_panel(driver: Firefox):
         tabs.switch_to_new_tab()
 
     # close the first 6 tabs
-    with driver.context(driver.CONTEXT_CHROME):
-        x_icon = tabs.get_element("tab-x-icon", multiple=True)
-        for i in range(num_tabs):
-            x_icon[i].click()
-
-        panel_ui.open_panel_menu()
-
-        # go into the history tab
-        panel_ui.get_element("panel-ui-history").click()
-
-        # check for history
-        recently_visited_container = panel_ui.get_element(
-            "panel-ui-history-recent-history-container"
-        )
-        recently_visited_items = panel_ui.get_element(
-            "panel-ui-history-recent-history-item",
-            multiple=True,
-            parent_element=recently_visited_container,
-        )
-
-        # ensure no actual items are there
-        assert len(recently_visited_items) == 1
-        assert recently_visited_items[0].get_attribute("label") == "(Empty)"
+    for i in range(num_tabs):
+        tabs.close_tab(tabs.get_tab(num_tabs - i))
+
+    panel_ui.confirm_history_clear()

tests/tabs/test_reopen_tab_through_history_menu.py

@@ -37,22 +37,12 @@ def test_reopen_tab_through_history_menu(driver: Firefox):
         driver.switch_to.window(driver.window_handles[i + 1])
 
     # close the first 6 tabs
-    with driver.context(driver.CONTEXT_CHROME):
-        x_icon = tabs.get_element("tab-x-icon", multiple=True)
-        for i in range(num_tabs):
-            x_icon[i].click()
+    for i in range(num_tabs):
+        tabs.close_tab(tabs.get_tab(num_tabs - i))
 
     # open menu bar and reopen recently closed tabs
     panel.open()
-    panel.open_panel_menu()
-    with driver.context(driver.CONTEXT_CHROME):
-        panel.get_element("panel-ui-history").click()
-
-        panel.element_clickable("panel-ui-history-recently-closed")
-        panel.get_element("panel-ui-history-recently-closed").click()
-
-        panel.element_clickable("panel-ui-history-recently-closed-reopen-tabs")
-        panel.get_element("panel-ui-history-recently-closed-reopen-tabs").click()
+    panel.reopen_recently_closed_tabs()
 
     # go through all the tabs and ensure they were the ones that were opened previously
     for i in range(num_tabs):