Add more sb methods into the driver

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -132,22 +132,34 @@ def extend_driver(driver):
     page.assert_element_not_visible = DM.assert_element_not_visible
     page.assert_text = DM.assert_text
     page.assert_exact_text = DM.assert_exact_text
+    page.assert_non_empty_text = DM.assert_non_empty_text
+    page.assert_text_not_visible = DM.assert_text_not_visible
     page.wait_for_element = DM.wait_for_element
     page.wait_for_text = DM.wait_for_text
     page.wait_for_exact_text = DM.wait_for_exact_text
+    page.wait_for_non_empty_text = DM.wait_for_non_empty_text
+    page.wait_for_text_not_visible = DM.wait_for_text_not_visible
     page.wait_for_and_accept_alert = DM.wait_for_and_accept_alert
     page.wait_for_and_dismiss_alert = DM.wait_for_and_dismiss_alert
     page.is_element_present = DM.is_element_present
     page.is_element_visible = DM.is_element_visible
     page.is_text_visible = DM.is_text_visible
     page.is_exact_text_visible = DM.is_exact_text_visible
     page.is_attribute_present = DM.is_attribute_present
+    page.is_non_empty_text_visible = DM.is_non_empty_text_visible
     page.get_text = DM.get_text
     page.find_element = DM.find_element
     page.find_elements = DM.find_elements
     page.locator = DM.locator
     page.get_page_source = DM.get_page_source
     page.get_title = DM.get_title
+    page.switch_to_default_window = DM.switch_to_default_window
+    page.switch_to_newest_window = DM.switch_to_newest_window
+    page.open_new_window = DM.open_new_window
+    page.open_new_tab = DM.open_new_tab
+    page.switch_to_window = DM.switch_to_window
+    page.switch_to_tab = DM.switch_to_tab
+    page.switch_to_frame = DM.switch_to_frame
     driver.page = page
     js = types.SimpleNamespace()
     js.js_click = DM.js_click
@@ -171,21 +183,27 @@ def extend_driver(driver):
     driver.assert_element_not_visible = DM.assert_element_not_visible
     driver.assert_text = DM.assert_text
     driver.assert_exact_text = DM.assert_exact_text
+    driver.assert_non_empty_text = DM.assert_non_empty_text
+    driver.assert_text_not_visible = DM.assert_text_not_visible
     driver.wait_for_element = DM.wait_for_element
     driver.wait_for_element_visible = DM.wait_for_element_visible
     driver.wait_for_element_present = DM.wait_for_element_present
     driver.wait_for_selector = DM.wait_for_selector
     driver.wait_for_text = DM.wait_for_text
     driver.wait_for_exact_text = DM.wait_for_exact_text
+    driver.wait_for_non_empty_text = DM.wait_for_non_empty_text
+    driver.wait_for_text_not_visible = DM.wait_for_text_not_visible
     driver.wait_for_and_accept_alert = DM.wait_for_and_accept_alert
     driver.wait_for_and_dismiss_alert = DM.wait_for_and_dismiss_alert
     driver.is_element_present = DM.is_element_present
     driver.is_element_visible = DM.is_element_visible
     driver.is_text_visible = DM.is_text_visible
     driver.is_exact_text_visible = DM.is_exact_text_visible
     driver.is_attribute_present = DM.is_attribute_present
-    driver.get_text = DM.get_text
+    driver.is_non_empty_text_visible = DM.is_non_empty_text_visible
+    driver.is_online = DM.is_online
     driver.js_click = DM.js_click
+    driver.get_text = DM.get_text
     driver.get_active_element_css = DM.get_active_element_css
     driver.get_locale_code = DM.get_locale_code
     driver.get_origin = DM.get_origin
@@ -197,6 +215,12 @@ def extend_driver(driver):
     driver.get_attribute = DM.get_attribute
     driver.get_page_source = DM.get_page_source
     driver.get_title = DM.get_title
+    driver.switch_to_default_window = DM.switch_to_default_window
+    driver.switch_to_newest_window = DM.switch_to_newest_window
+    driver.open_new_window = DM.open_new_window
+    driver.open_new_tab = DM.open_new_tab
+    driver.switch_to_window = DM.switch_to_window
+    driver.switch_to_tab = DM.switch_to_tab
     driver.switch_to_frame = DM.switch_to_frame
     if hasattr(driver, "proxy"):
         driver.set_wire_proxy = DM.set_wire_proxy

seleniumbase/core/sb_driver.py

@@ -94,6 +94,16 @@ def assert_text(self, *args, **kwargs):
     def assert_exact_text(self, *args, **kwargs):
         page_actions.assert_exact_text(self.driver, *args, **kwargs)
 
+    def assert_non_empty_text(self, *args, **kwargs):
+        return page_actions.assert_non_empty_text(
+            self.driver, *args, **kwargs
+        )
+
+    def assert_text_not_visible(self, *args, **kwargs):
+        return page_actions.assert_text_not_visible(
+            self.driver, *args, **kwargs
+        )
+
     def wait_for_element(self, *args, **kwargs):
         return page_actions.wait_for_element(self.driver, *args, **kwargs)
 
@@ -112,6 +122,16 @@ def wait_for_text(self, *args, **kwargs):
     def wait_for_exact_text(self, *args, **kwargs):
         return page_actions.wait_for_exact_text(self.driver, *args, **kwargs)
 
+    def wait_for_non_empty_text(self, *args, **kwargs):
+        return page_actions.wait_for_non_empty_text(
+            self.driver, *args, **kwargs
+        )
+
+    def wait_for_text_not_visible(self, *args, **kwargs):
+        return page_actions.wait_for_text_not_visible(
+            self.driver, *args, **kwargs
+        )
+
     def wait_for_and_accept_alert(self, *args, **kwargs):
         return page_actions.wait_for_and_accept_alert(
             self.driver, *args, **kwargs
@@ -134,14 +154,22 @@ def is_text_visible(self, *args, **kwargs):
     def is_exact_text_visible(self, *args, **kwargs):
         return page_actions.is_exact_text_visible(self.driver, *args, **kwargs)
 
-    def get_text(self, *args, **kwargs):
-        return page_actions.get_text(self.driver, *args, **kwargs)
+    def is_attribute_present(self, *args, **kwargs):
+        return page_actions.has_attribute(self.driver, *args, **kwargs)
+
+    def is_non_empty_text_visible(self, *args, **kwargs):
+        return page_actions.is_non_empty_text_visible(
+            self.driver, *args, **kwargs
+        )
+
+    def is_online(self):
+        return self.driver.execute_script("return navigator.onLine;")
 
     def js_click(self, *args, **kwargs):
         return page_actions.js_click(self.driver, *args, **kwargs)
 
-    def is_attribute_present(self, *args, **kwargs):
-        return page_actions.has_attribute(self.driver, *args, **kwargs)
+    def get_text(self, *args, **kwargs):
+        return page_actions.get_text(self.driver, *args, **kwargs)
 
     def get_active_element_css(self, *args, **kwargs):
         return js_utils.get_active_element_css(self.driver, *args, **kwargs)
@@ -182,7 +210,32 @@ def highlight_if_visible(
         if self.is_element_visible(selector, by=by):
             self.highlight(selector, by=by, loops=loops, scroll=scroll)
 
-    def switch_to_frame(self, frame):
+    def switch_to_default_window(self):
+        self.driver.switch_to.window(self.driver.window_handles[0])
+
+    def switch_to_newest_window(self):
+        self.driver.switch_to.window(self.driver.window_handles[-1])
+
+    def open_new_window(self, switch_to=True):
+        if switch_to:
+            try:
+                self.driver.switch_to.new_window("tab")
+            except Exception:
+                self.driver.execute_script("window.open('');")
+                self.switch_to_newest_window()
+        else:
+            self.driver.execute_script("window.open('');")
+
+    def open_new_tab(self, switch_to=True):
+        self.open_new_window(switch_to=switch_to)
+
+    def switch_to_window(self, *args, **kwargs):
+        page_actions.switch_to_window(self.driver, *args, **kwargs)
+
+    def switch_to_tab(self, *args, **kwargs):
+        self.switch_to_window(*args, **kwargs)
+
+    def switch_to_frame(self, frame="iframe"):
         if isinstance(frame, WebElement):
             self.driver.switch_to.frame(frame)
         else: