fix test

Author: sarinali

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_undo_close_tab_private_browsing.py

@@ -1,3 +1,5 @@
+import logging
+
 import pytest
 from selenium.webdriver import Firefox
 
@@ -24,7 +26,7 @@ def test_undo_close_tab_private_browsing(driver: Firefox, sys_platform: str):
 
     # open a new private window and open a new tab
     panel_ui.open_private_window()
-    tabs.switch_to_new_tab()
+    tabs.switch_to_new_window()
 
     # open a new tab
     tabs.new_tab_by_button()
@@ -48,4 +50,9 @@ def test_undo_close_tab_private_browsing(driver: Firefox, sys_platform: str):
     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"
+        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