Merge pull request #2085 from seleniumbase/enhancements-and-bug-fixes

Enhancements and bug fixes

Author: mdmintz

examples/raw_browser_launcher.py

@@ -1,27 +1,22 @@
 """Driver() test. Runs with "python". (pytest not needed)."""
 from seleniumbase import Driver
-from seleniumbase import js_utils
-from seleniumbase import page_actions
 
-# Example with options. (Also accepts command-line options.)
 driver = Driver(browser="chrome", headless=False)
 try:
     driver.get("https://seleniumbase.io/apps/calculator")
-    page_actions.wait_for_element(driver, '[id="4"]').click()
-    page_actions.wait_for_element(driver, '[id="2"]').click()
-    page_actions.wait_for_text(driver, "42", "#output")
-    js_utils.highlight_with_js(driver, "#output", loops=6)
+    driver.click('[id="4"]')
+    driver.click('[id="2"]')
+    driver.assert_text("42", "#output")
+    driver.highlight("#output", loops=6)
 finally:
     driver.quit()
 
-# Example 2 using default args or command-line options
 driver = Driver()
 try:
     driver.get("https://seleniumbase.github.io/demo_page")
-    js_utils.highlight_with_js(driver, "h2", loops=5)
-    by_css = "css selector"
-    driver.find_element(by_css, "#myTextInput").send_keys("Automation")
-    driver.find_element(by_css, "#checkBox1").click()
-    js_utils.highlight_with_js(driver, "img", loops=5)
+    driver.highlight("h2")
+    driver.type("#myTextInput", "Automation")
+    driver.click("#checkBox1")
+    driver.highlight("img", loops=6)
 finally:
     driver.quit()

examples/raw_driver_context.py

@@ -1,24 +1,20 @@
 """Can run with "python". (pytest not needed)."""
-from seleniumbase import js_utils
-from seleniumbase import page_actions
 from seleniumbase import DriverContext
 
-# Driver Context Manager - (By default, browser="chrome". Lots of options)
 with DriverContext() as driver:
     driver.get("https://seleniumbase.github.io/")
-    js_utils.highlight_with_js(driver, 'img[alt="SeleniumBase"]', loops=6)
+    driver.highlight('img[alt="SeleniumBase"]', loops=6)
 
 with DriverContext(browser="chrome", incognito=True) as driver:
     driver.get("https://seleniumbase.io/apps/calculator")
-    page_actions.wait_for_element(driver, '[id="4"]').click()
-    page_actions.wait_for_element(driver, '[id="2"]').click()
-    page_actions.wait_for_text(driver, "42", "#output")
-    js_utils.highlight_with_js(driver, "#output", loops=6)
+    driver.click('[id="4"]')
+    driver.click('[id="2"]')
+    driver.assert_text("42", "#output")
+    driver.highlight("#output", loops=6)
 
 with DriverContext() as driver:
     driver.get("https://seleniumbase.github.io/demo_page")
-    js_utils.highlight_with_js(driver, "h2", loops=5)
-    by_css = "css selector"
-    driver.find_element(by_css, "#myTextInput").send_keys("Automation")
-    driver.find_element(by_css, "#checkBox1").click()
-    js_utils.highlight_with_js(driver, "img", loops=5)
+    driver.highlight("h2")
+    driver.type("#myTextInput", "Automation")
+    driver.click("#checkBox1")
+    driver.highlight("img", loops=6)

examples/raw_uc_mode.py

@@ -2,15 +2,16 @@
 from seleniumbase import SB
 
 with SB(uc=True) as sb:
-    sb.open("https://nowsecure.nl/#relax")
-    sb.sleep(3)
+    sb.driver.get("https://nowsecure.nl/#relax")
+    sb.sleep(2)
     if not sb.is_text_visible("OH YEAH, you passed!", "h1"):
         sb.get_new_driver(undetectable=True)
-        sb.open("https://nowsecure.nl/#relax")
-        sb.sleep(3)
+        sb.driver.get("https://nowsecure.nl/#relax")
+        sb.sleep(2)
     if not sb.is_text_visible("OH YEAH, you passed!", "h1"):
         if sb.is_element_visible('iframe[src*="challenge"]'):
             with sb.frame_switch('iframe[src*="challenge"]'):
                 sb.click("area")
-                sb.sleep(3)
+                sb.sleep(4)
+    sb.activate_demo_mode()
     sb.assert_text("OH YEAH, you passed!", "h1", timeout=3)

examples/test_repeat_tests.py

@@ -10,21 +10,21 @@
 class RepeatTests(BaseCase):
     @parameterized.expand([[]] * 2)
     def test_repeat_this_test_with_parameterized(self):
-        self.open("seleniumbase.github.io")
+        self.open("seleniumbase.github.io/")
         self.click('a[href="help_docs/method_summary/"]')
         self.assert_text("API Reference", "h1")
 
 
 @pytest.mark.parametrize("", [[]] * 2)
 def test_repeat_this_test_with_pytest_parametrize(sb):
-    sb.open("seleniumbase.github.io")
+    sb.open("seleniumbase.github.io/")
     sb.click('a[href="seleniumbase/console_scripts/ReadMe/"]')
     sb.assert_text("Console Scripts", "h1")
 
 
 class RepeatTestsWithPytest:
     @pytest.mark.parametrize("", [[]] * 2)
     def test_repeat_test_with_pytest_parametrize(self, sb):
-        sb.open("seleniumbase.github.io")
+        sb.open("seleniumbase.github.io/")
         sb.click('a[href="help_docs/customizing_test_runs/"]')
         sb.assert_text("Command Line Options", "h1")

examples/test_url_asserts.py

@@ -4,8 +4,8 @@
 
 class URLTestClass(BaseCase):
     def test_url_asserts(self):
-        self.open("https://seleniumbase.io/")
-        self.assert_url("https://seleniumbase.io/")
+        self.open("https://seleniumbase.github.io/")
+        self.assert_url("https://seleniumbase.github.io/")
         self.assert_title_contains("SeleniumBase")
         self.js_click('nav a:contains("Coffee Cart")')
         self.assert_url_contains("/coffee")

examples/uc_cdp_events.py

@@ -25,13 +25,13 @@ def fail_me(self):
     def test_display_cdp_events(self):
         if not (self.undetectable and self.uc_cdp_events):
             self.get_new_driver(undetectable=True, uc_cdp_events=True)
-        self.open("https://nowsecure.nl/#relax")
+        self.driver.get("https://nowsecure.nl/#relax")
         try:
             self.verify_success()
         except Exception:
             self.clear_all_cookies()
             self.get_new_driver(undetectable=True, uc_cdp_events=True)
-            self.open("https://nowsecure.nl/#relax")
+            self.driver.get("https://nowsecure.nl/#relax")
             try:
                 self.verify_success()
             except Exception:

examples/verify_undetected.py

@@ -20,13 +20,13 @@ def fail_me(self):
     def test_browser_is_undetected(self):
         if not (self.undetectable):
             self.get_new_driver(undetectable=True)
-        self.open("https://nowsecure.nl/#relax")
+        self.driver.get("https://nowsecure.nl/#relax")
         try:
             self.verify_success()
         except Exception:
             self.clear_all_cookies()
             self.get_new_driver(undetectable=True)
-            self.open("https://nowsecure.nl/#relax")
+            self.driver.get("https://nowsecure.nl/#relax")
             try:
                 self.verify_success()
             except Exception:

help_docs/method_summary.md

@@ -171,6 +171,11 @@ self.hover(selector, by="css selector", timeout=None)
 # self.hover_over_element(selector, by="css selector", timeout=None)
 
 self.hover_and_click(
+    hover_selector, click_selector,
+    hover_by="css selector", click_by="css selector",
+    timeout=None, js_click=False)
+
+self.hover_and_js_click(
     hover_selector, click_selector,
     hover_by="css selector", click_by="css selector",
     timeout=None)
@@ -418,6 +423,8 @@ self.disable_beforeunload()
 
 self.get_domain_url(url)
 
+self.get_active_element_css()
+
 self.get_beautiful_soup(source=None)
 
 self.get_unique_links()

help_docs/syntax_formats.md

@@ -2,9 +2,9 @@
 
 <a id="syntax_formats"></a>
 
-## [<img src="https://seleniumbase.github.io/img/logo6.png" title="SeleniumBase" width="40">](https://github.com/seleniumbase/SeleniumBase/) The 23 Syntax Formats / Design Patterns
+<h2><img src="https://seleniumbase.github.io/img/logo6.png" title="SeleniumBase" width="40"> The 23 Syntax Formats / Design Patterns</h2>
 
-<h3>SeleniumBase supports multiple ways of structuring tests:</h3>
+<h3>🔡 SeleniumBase supports multiple ways of structuring tests:</h3>
 
 <blockquote>
 <p dir="auto"></p>
@@ -873,30 +873,26 @@ with SB(test=True, rtf=True, demo=True) as sb:
 This pure Python format gives you a raw <code translate="no">webdriver</code> instance in a <code translate="no">with</code> block. The SeleniumBase Driver Manager will automatically make sure that your driver is compatible with your browser version. It gives you full access to customize driver options via method args or via the command-line. The driver will automatically call <code translate="no">quit()</code> after the code leaves the <code translate="no">with</code> block. Here are some examples:
 
 ```python
-"""This script can be run with pure "python". (pytest not needed)."""
-from seleniumbase import js_utils
-from seleniumbase import page_actions
+"""Can run with "python". (pytest not needed)."""
 from seleniumbase import DriverContext
 
-# Driver Context Manager - (By default, browser="chrome". Lots of options)
 with DriverContext() as driver:
     driver.get("https://seleniumbase.github.io/")
-    js_utils.highlight_with_js(driver, 'img[alt="SeleniumBase"]', loops=6)
+    driver.highlight('img[alt="SeleniumBase"]', loops=6)
 
 with DriverContext(browser="chrome", incognito=True) as driver:
     driver.get("https://seleniumbase.io/apps/calculator")
-    page_actions.wait_for_element(driver, '[id="4"]').click()
-    page_actions.wait_for_element(driver, '[id="2"]').click()
-    page_actions.wait_for_text(driver, "42", "#output")
-    js_utils.highlight_with_js(driver, "#output", loops=6)
+    driver.click('[id="4"]')
+    driver.click('[id="2"]')
+    driver.assert_text("42", "#output")
+    driver.highlight("#output", loops=6)
 
 with DriverContext() as driver:
     driver.get("https://seleniumbase.github.io/demo_page")
-    js_utils.highlight_with_js(driver, "h2", loops=5)
-    by_css = "css selector"
-    driver.find_element(by_css, "#myTextInput").send_keys("Automation")
-    driver.find_element(by_css, "#checkBox1").click()
-    js_utils.highlight_with_js(driver, "img", loops=5)
+    driver.highlight("h2")
+    driver.type("#myTextInput", "Automation")
+    driver.click("#checkBox1")
+    driver.highlight("img", loops=6)
 ```
 
 (See <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/raw_driver_context.py">examples/raw_driver_context.py</a> for an example.)
@@ -907,31 +903,48 @@ with DriverContext() as driver:
 Another way of running Selenium tests with pure ``python`` (as opposed to using ``pytest`` or ``pynose``) is by using this format, which bypasses [BaseCase](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/fixtures/base_case.py) methods while still giving you a flexible driver with a manager. SeleniumBase includes helper files such as [page_actions.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/fixtures/page_actions.py), which may help you get around some of the limitations of bypassing ``BaseCase``. Here's an example:
 
 ```python
-"""This script can be run with pure "python". (pytest not needed)."""
+"""Driver() test. Runs with "python". (pytest not needed)."""
 from seleniumbase import Driver
-from seleniumbase import js_utils
-from seleniumbase import page_actions
 
-# Example with options. (Also accepts command-line options.)
 driver = Driver(browser="chrome", headless=False)
 try:
     driver.get("https://seleniumbase.io/apps/calculator")
-    page_actions.wait_for_element(driver, '[id="4"]').click()
-    page_actions.wait_for_element(driver, '[id="2"]').click()
-    page_actions.wait_for_text(driver, "42", "#output")
-    js_utils.highlight_with_js(driver, "#output", loops=6)
+    driver.click('[id="4"]')
+    driver.click('[id="2"]')
+    driver.assert_text("42", "#output")
+    driver.highlight("#output", loops=6)
 finally:
     driver.quit()
 
-# Example 2 using default args or command-line options
 driver = Driver()
 try:
     driver.get("https://seleniumbase.github.io/demo_page")
-    js_utils.highlight_with_js(driver, "h2", loops=5)
-    by_css = "css selector"
-    driver.find_element(by_css, "#myTextInput").send_keys("Automation")
-    driver.find_element(by_css, "#checkBox1").click()
-    js_utils.highlight_with_js(driver, "img", loops=5)
+    driver.highlight("h2")
+    driver.type("#myTextInput", "Automation")
+    driver.click("#checkBox1")
+    driver.highlight("img", loops=6)
+finally:
+    driver.quit()
+"""Driver() test. Runs with "python". (pytest not needed)."""
+from seleniumbase import Driver
+
+driver = Driver(browser="chrome", headless=False)
+try:
+    driver.get("https://seleniumbase.io/apps/calculator")
+    driver.click('[id="4"]')
+    driver.click('[id="2"]')
+    driver.assert_text("42", "#output")
+    driver.highlight("#output", loops=6)
+finally:
+    driver.quit()
+
+driver = Driver()
+try:
+    driver.get("https://seleniumbase.github.io/demo_page")
+    driver.highlight("h2")
+    driver.type("#myTextInput", "Automation")
+    driver.click("#checkBox1")
+    driver.highlight("img", loops=6)
 finally:
     driver.quit()
 ```

mkdocs_build/requirements.txt

@@ -3,7 +3,7 @@
 
 regex>=2023.8.8
 PyYAML>=6.0.1
-pymdown-extensions>=10.2.1
+pymdown-extensions>=10.3
 pipdeptree>=2.13.0
 python-dateutil>=2.8.2
 Markdown==3.4.4
@@ -20,7 +20,7 @@ paginate==0.5.6
 pyquery==2.0.0
 readtime==3.0.0
 mkdocs==1.5.2
-mkdocs-material==9.2.6
+mkdocs-material==9.2.8
 mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1.1