Merge pull request #2125 from seleniumbase/driver-updates-and-internal-methods

`driver` updates and internal methods

Author: mdmintz

help_docs/method_summary.md

@@ -914,6 +914,8 @@ self.process_deferred_asserts(print_only=False)
 
 self.fail(msg=None)  # Inherited from "unittest"
 
+self._check_browser()  # Fails test cleanly if the active window is closed
+
 self._print(TEXT)  # Calls Python's print() / Allows for translations
 ```
 

mkdocs_build/requirements.txt

@@ -1,7 +1,7 @@
 # mkdocs dependencies for generating the seleniumbase.io website
 # Minimum Python version: 3.8 (for generating docs only)
 
-regex>=2023.8.8
+regex>=2022.10.31
 PyYAML>=6.0.1
 pymdown-extensions>=10.3
 pipdeptree>=2.13.0
@@ -19,8 +19,8 @@ Babel==2.12.1
 paginate==0.5.6
 pyquery==2.0.0
 readtime==3.0.0
-mkdocs==1.5.2
-mkdocs-material==9.3.1
+mkdocs==1.5.3
+mkdocs-material==9.3.2
 mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
-mkdocs-material-extensions==1.1.1
+mkdocs-material-extensions==1.2

requirements.txt

@@ -27,7 +27,7 @@ wsproto==1.2.0
 selenium==4.11.2
 cssselect==1.2.0
 sortedcontainers==2.4.0
-fasteners==0.18
+fasteners==0.19
 execnet==2.0.2
 iniconfig==2.0.0
 pluggy==1.2.0;python_version<"3.8"
@@ -56,7 +56,7 @@ pyotp==2.9.0
 markdown-it-py==2.2.0;python_version<"3.8"
 markdown-it-py==3.0.0;python_version>="3.8"
 mdurl==0.1.2
-rich==13.5.2
+rich==13.5.3
 
 # --- Testing Requirements --- #
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.18.7"
+__version__ = "4.18.8"

seleniumbase/core/browser_launcher.py

@@ -107,7 +107,10 @@ def make_driver_executable_if_not(driver_path):
 
 def extend_driver(driver):
     # Extend the driver with new methods
+    driver.default_find_element = driver.find_element
     DM = sb_driver.DriverMethods(driver)
+    driver.find_element = DM.find_element
+    driver.locator = DM.locator
     page = types.SimpleNamespace()
     page.open = DM.open_url
     page.click = DM.click
@@ -2168,9 +2171,6 @@ def get_local_driver(
             major_edge_version = None
         if major_edge_version:
             use_version = major_edge_version
-        use_version = find_edgedriver_version_to_use(
-            use_version, driver_version
-        )
         edge_driver_version = None
         edgedriver_upgrade_needed = False
         if os.path.exists(LOCAL_EDGEDRIVER):
@@ -2197,8 +2197,13 @@ def get_local_driver(
                     output = 0
                 if int(output) >= 2:
                     edge_driver_version = output
+                    if driver_version == "keep":
+                        driver_version = edge_driver_version
             except Exception:
                 pass
+        use_version = find_edgedriver_version_to_use(
+            use_version, driver_version
+        )
         local_edgedriver_exists = False
         if LOCAL_EDGEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
             local_edgedriver_exists = True
@@ -2671,6 +2676,8 @@ def get_local_driver(
                     output = full_ch_driver_version.split(".")[0]
                     if int(output) >= 2:
                         ch_driver_version = output
+                        if driver_version == "keep":
+                            driver_version = ch_driver_version
                 except Exception:
                     pass
             elif path_chromedriver:
@@ -2693,8 +2700,21 @@ def get_local_driver(
                     output = full_ch_driver_version.split(".")[0]
                     if int(output) >= 2:
                         ch_driver_version = output
+                        if driver_version == "keep":
+                            use_version = ch_driver_version
                 except Exception:
                     pass
+            disable_build_check = True
+            uc_driver_version = None
+            if is_using_uc(undetectable, browser_name):
+                uc_driver_version = get_uc_driver_version()
+                if multi_proxy:
+                    sb_config.multi_proxy = True
+                if uc_driver_version and driver_version == "keep":
+                    driver_version = uc_driver_version
+            use_version = find_chromedriver_version_to_use(
+                use_version, driver_version
+            )
             if headless2:
                 try:
                     if use_version == "latest" or int(use_version) >= 109:
@@ -2719,15 +2739,6 @@ def get_local_driver(
             elif headless:
                 if "--headless" not in chrome_options.arguments:
                     chrome_options.add_argument("--headless")
-            disable_build_check = True  # True is NEW for Chrome 115 changes!
-            uc_driver_version = None
-            if is_using_uc(undetectable, browser_name):
-                uc_driver_version = get_uc_driver_version()
-                if multi_proxy:
-                    sb_config.multi_proxy = True
-            use_version = find_chromedriver_version_to_use(
-                use_version, driver_version
-            )
             if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
                 try:
                     make_driver_executable_if_not(LOCAL_CHROMEDRIVER)

seleniumbase/core/sb_driver.py

@@ -1,12 +1,34 @@
 """Add new methods to extend the driver"""
 from seleniumbase.fixtures import js_utils
 from seleniumbase.fixtures import page_actions
+from seleniumbase.fixtures import page_utils
 
 
 class DriverMethods():
     def __init__(self, driver):
         self.driver = driver
 
+    def find_element(self, by, value=None):
+        if not value:
+            value = by
+            by = "css selector"
+        else:
+            value, by = page_utils.swap_selector_and_by_if_reversed(value, by)
+        return self.driver.default_find_element(by=by, value=value)
+
+    def locator(self, selector, by=None):
+        if not by:
+            by = "css selector"
+        else:
+            selector, by = page_utils.swap_selector_and_by_if_reversed(
+                selector, by
+            )
+        try:
+            return self.driver.default_find_element(by=by, value=selector)
+        except Exception:
+            pass
+        raise Exception('No such Element: {%s} (by="%s")!' % (selector, by))
+
     def open_url(self, *args, **kwargs):
         page_actions.open_url(self.driver, *args, **kwargs)