seleniumbase 4.30.0__tar.gz → 4.30.2__tar.gz

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.30.0
+Version: 4.30.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -68,7 +68,7 @@ Requires-Dist: setuptools>=70.2.0; python_version >= "3.10"
 Requires-Dist: wheel>=0.42.0; python_version < "3.8"
 Requires-Dist: wheel>=0.44.0; python_version >= "3.8"
 Requires-Dist: attrs>=24.2.0
-Requires-Dist: certifi>=2024.7.4
+Requires-Dist: certifi>=2024.8.30
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: filelock>=3.12.2; python_version < "3.8"
 Requires-Dist: filelock>=3.15.4; python_version >= "3.8"
@@ -158,7 +158,7 @@ Provides-Extra: pdfminer
 Requires-Dist: pdfminer.six==20221105; python_version < "3.8" and extra == "pdfminer"
 Requires-Dist: pdfminer.six==20240706; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: cryptography==39.0.2; python_version < "3.9" and extra == "pdfminer"
-Requires-Dist: cryptography==43.0.0; python_version >= "3.9" and extra == "pdfminer"
+Requires-Dist: cryptography==43.0.1; python_version >= "3.9" and extra == "pdfminer"
 Requires-Dist: cffi==1.15.1; python_version < "3.8" and extra == "pdfminer"
 Requires-Dist: cffi==1.17.0; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: pycparser==2.22; extra == "pdfminer"

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/mkdocs_build/requirements.txt

@@ -11,16 +11,16 @@ MarkupSafe==2.1.5
 Jinja2==3.1.4
 click==8.1.7
 ghp-import==2.1.0
-watchdog==5.0.0
+watchdog==5.0.2
 cairocffi==1.7.1
 pathspec==0.12.1
 Babel==2.16.0
 paginate==0.5.7
 lxml==5.3.0
-pyquery==2.0.0
+pyquery==2.0.1
 readtime==3.0.0
-mkdocs==1.6.0
-mkdocs-material==9.5.33
+mkdocs==1.6.1
+mkdocs-material==9.5.34
 mkdocs-exclude-search==0.6.6
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.3.1

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/requirements.txt

@@ -8,7 +8,7 @@ setuptools>=70.2.0;python_version>="3.10"
 wheel>=0.42.0;python_version<"3.8"
 wheel>=0.44.0;python_version>="3.8"
 attrs>=24.2.0
-certifi>=2024.7.4
+certifi>=2024.8.30
 exceptiongroup>=1.2.2
 filelock>=3.12.2;python_version<"3.8"
 filelock>=3.15.4;python_version>="3.8"

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.30.0"
+__version__ = "4.30.2"

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase/console_scripts/ReadMe.md

@@ -350,9 +350,10 @@ sbase mkfile new_test.py
 
 * Options:
 
+``--uc``  (UC Mode boilerplate using SB context manager)
 `-b` / `--basic`  (Basic boilerplate / single-line test)
-`-r` / `--rec`  (adds Pdb+ breakpoint for Recorder Mode)
-``--url=URL``  (makes the test start on a specific page)
+`-r` / `--rec`  (Adds Pdb+ breakpoint for Recorder Mode)
+``--url=URL``  (Makes the test start on a specific page)
 
 * Language Options:
 
@@ -381,6 +382,7 @@ methods: "open", "type", "click", "assert_element",
 and "assert_text". If using the basic boilerplate
 option, only the "open" method is included. Only the
 BaseCase format supports Languages or Recorder Mode.
+UC Mode automatically uses English with SB() format.
 
 <h3>mkrec / record / codegen</h3>
 

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase/console_scripts/run.py

@@ -264,9 +264,10 @@ def show_mkfile_usage():
     print("  Example:")
     print("           sbase mkfile new_test.py")
     print("  Options:")
+    print("           --uc  (UC Mode boilerplate using SB context manager)")
     print("           -b / --basic  (Basic boilerplate / single-line test)")
-    print("           -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)")
-    print("           --url=URL  (makes the test start on a specific page)")
+    print("           -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)")
+    print("           --url=URL  (Makes the test start on a specific page)")
     print("  Language Options:")
     print("           --en / --English    |    --zh / --Chinese")
     print("           --nl / --Dutch      |    --fr / --French")
@@ -289,6 +290,7 @@ def show_mkfile_usage():
     print('           and "assert_text". If using the basic boilerplate')
     print('           option, only the "open" method is included. Only the')
     print("           BaseCase format supports Languages or Recorder Mode.")
+    print("           UC Mode automatically uses English with SB() format.")
     print("")
 
 

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase/console_scripts/sb_mkfile.py

@@ -9,9 +9,10 @@ Example:
     sbase mkfile new_test.py
 
 Options:
+    --uc  (UC Mode boilerplate using SB context manager)
     -b / --basic  (Basic boilerplate / single-line test)
-    -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)
-    --url=URL  (makes the test start on a specific page)
+    -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)
+    --url=URL  (Makes the test start on a specific page)
 
 Language Options:
     --en / --English    |    --zh / --Chinese
@@ -37,6 +38,7 @@ Output:
     and "assert_text". If using the basic boilerplate
     option, only the "open" method is included. Only the
     BaseCase format supports Languages or Recorder Mode.
+    UC Mode automatically uses English with SB() format.
 """
 import codecs
 import colorama
@@ -52,9 +54,10 @@ def invalid_run_command(msg=None):
     exp += "  Example:\n"
     exp += "           sbase mkfile new_test.py\n"
     exp += "  Options:\n"
+    exp += "           --uc  (UC Mode boilerplate using SB context manager)\n"
     exp += "           -b / --basic  (Basic boilerplate / single-line test)\n"
-    exp += "           -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)\n"
-    exp += "           --url=URL  (makes the test start on a specific page)\n"
+    exp += "           -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)\n"
+    exp += "           --url=URL  (Makes the test start on a specific page)\n"
     exp += "  Language Options:\n"
     exp += "           --en / --English    |    --zh / --Chinese\n"
     exp += "           --nl / --Dutch      |    --fr / --French\n"
@@ -77,6 +80,7 @@ def invalid_run_command(msg=None):
     exp += '           and "assert_text". If using the basic boilerplate\n'
     exp += '           option, only the "open" method is included. Only the\n'
     exp += "           BaseCase format supports Languages or Recorder Mode.\n"
+    exp += "           UC Mode automatically uses English with SB() format.\n"
     if not msg:
         raise Exception("INVALID RUN COMMAND!\n\n%s" % exp)
     elif msg == "help":
@@ -105,6 +109,7 @@ def main():
         cr = colorama.Style.RESET_ALL
 
     basic = False
+    use_uc = False
     help_me = False
     recorder = False
     error_msg = None
@@ -152,6 +157,9 @@ def main():
                 recorder = True
             elif option == "--record" or option == "--recorder":
                 recorder = True
+            elif use_uc:
+                # UC must use English & ContextManager formats
+                continue
             elif option == "--en" or option == "--english":
                 language = "English"
             elif option == "--zh" or option == "--chinese":
@@ -184,6 +192,11 @@ def main():
                 syntax = "DriverContext"
             elif option == "--dm" or option == "--driver-manager":
                 syntax = "DriverManager"
+            elif option == "--uc":
+                basic = True
+                language = "English"
+                syntax = "ContextManager"
+                use_uc = True
             else:
                 invalid_cmd = "\n===> INVALID OPTION: >> %s <<\n" % option
                 invalid_cmd = invalid_cmd.replace(">> ", ">>" + c5 + " ")
@@ -319,16 +332,22 @@ def main():
         data = []
         data.append("from seleniumbase import SB")
         data.append("")
-        data.append('with SB(browser="chrome") as sb:')
-        data.append(
-            '    sb.open("data:text/html,<div>Hello<br><input></div>")'
-        )
+        if use_uc:
+            data.append('with SB(uc=True) as sb:')
+        else:
+            data.append('with SB(browser="chrome") as sb:')
+        if use_uc:
+            data.append('    url = "%s"' % url)
+            data.append("    sb.uc_open_with_reconnect(url, 4)")
+            data.append("    sb.uc_gui_click_captcha()")
+        else:
+            data.append('    sb.open("%s")' % url)
         if not basic:
             data.append('    sb.type("input", "Goodbye")  # selector, text')
-            data.append('    sb.click("html body > div")  # selector')
+            data.append('    sb.click("html body > p")  # selector')
             data.append('    sb.assert_element("input")  # selector')
-            data.append('    sb.assert_text("Hello", "div")  # text, selector')
-            data.append('    sb.highlight("div")  # selector')
+            data.append('    sb.assert_text("Hello", "p")  # text, selector')
+            data.append('    sb.highlight("p")  # selector')
             data.append("    sb.sleep(0.5)  # seconds")
         data.append("")
         new_data = data
@@ -337,7 +356,14 @@ def main():
         data.append("from seleniumbase import DriverContext")
         data.append("")
         data.append('with DriverContext(browser="chrome") as driver:')
-        data.append('    driver.get("data:text/html,<p>Hello<br><input>")')
+        data.append('    driver.get("%s")' % url)
+        if not basic:
+            data.append('    driver.type("input", "Goodbye")  # sel, text')
+            data.append('    driver.click("html body > p")  # selector')
+            data.append('    driver.assert_element("input")  # selector')
+            data.append('    driver.assert_text("Hello", "p")  # text, sel')
+            data.append('    driver.highlight("p")  # selector')
+            data.append("    driver.sleep(0.5)  # seconds")
         data.append("")
         new_data = data
     elif language == "English" and syntax == "DriverManager":
@@ -346,7 +372,14 @@ def main():
         data.append("")
         data.append('driver = Driver(browser="chrome")')
         data.append("try:")
-        data.append('    driver.get("data:text/html,<p>Hello<br><input>")')
+        data.append('    driver.get("%s")' % url)
+        if not basic:
+            data.append('    driver.type("input", "Goodbye")  # sel, text')
+            data.append('    driver.click("html body > p")  # selector')
+            data.append('    driver.assert_element("input")  # selector')
+            data.append('    driver.assert_text("Hello", "p")  # text, sel')
+            data.append('    driver.highlight("p")  # selector')
+            data.append("    driver.sleep(0.5)  # seconds")
         data.append("finally:")
         data.append("    driver.quit()")
         data.append("")

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase/core/browser_launcher.py

@@ -340,17 +340,19 @@ def find_edgedriver_version_to_use(use_version, driver_version):
     return use_version
 
 
-def has_cf(text):
+def has_captcha(text):
     if (
         "<title>403 Forbidden</title>" in text
         or "Permission Denied</title>" in text
         or 'id="challenge-error-text"' in text
         or "<title>Just a moment..." in text
         or 'action="/?__cf_chl_f_tk' in text
+        or 'id="challenge-widget-' in text
         or 'src="chromedriver.js"' in text
         or 'class="g-recaptcha"' in text
         or 'content="Pixelscan"' in text
         or 'id="challenge-form"' in text
+        or "/challenge-platform" in text
         or "window._cf_chl_opt" in text
         or "/recaptcha/api.js" in text
         or "/turnstile/" in text
@@ -377,7 +379,7 @@ def uc_special_open_if_cf(
                 status_str.startswith("3")
                 or status_str.startswith("4")
                 or status_str.startswith("5")
-                or has_cf(req_get.text)
+                or has_captcha(req_get.text)
             ):
                 special = True
                 if status_str == "403" or status_str == "429":
@@ -763,6 +765,8 @@ def _on_a_cf_turnstile_page(driver):
     source = driver.get_page_source()
     if (
         'data-callback="onCaptchaSuccess"' in source
+        or "/challenge-platform/scripts/" in source
+        or 'id="challenge-widget-' in source
         or "cf-turnstile-" in source
     ):
         return True
@@ -863,9 +867,16 @@ def _uc_gui_click_captcha(
                     frame = "%s div[style]" % frame
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present("div.spacer div[style]")
+                    and driver.is_element_present("div.spacer div")
                 ):
-                    frame = "div.spacer div[style]"
+                    frame = "div.spacer div"
+                elif (
+                    driver.is_element_present('script[src*="challenges.c"]')
+                    and driver.is_element_present(
+                        '[data-testid*="challenge-"] div'
+                    )
+                ):
+                    frame = '[data-testid*="challenge-"] div'
                 elif (
                     (
                         driver.is_element_present('[name*="cf-turnstile-"]')
@@ -883,6 +894,14 @@ def _uc_gui_click_captcha(
                     )
                 ):
                     frame = "%s .cf-turnstile-wrapper" % frame
+                elif (
+                    frame != "iframe"
+                    and driver.is_element_present(
+                        '%s [name*="cf-turnstile"]' % frame
+                    )
+                    and driver.is_element_present("%s div" % frame)
+                ):
+                    frame = "%s div" % frame
                 elif driver.is_element_present(".cf-turnstile-wrapper"):
                     frame = ".cf-turnstile-wrapper"
                 elif driver.is_element_present(
@@ -1099,9 +1118,16 @@ def _uc_gui_handle_captcha(
                     frame = '[data-callback="onCaptchaSuccess"]'
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present("div.spacer div[style]")
+                    and driver.is_element_present("div.spacer div")
+                ):
+                    frame = "div.spacer div"
+                elif (
+                    driver.is_element_present('script[src*="challenges.c"]')
+                    and driver.is_element_present(
+                        '[data-testid*="challenge-"] div'
+                    )
                 ):
-                    frame = "div.spacer div[style]"
+                    frame = '[data-testid*="challenge-"] div'
                 elif (
                     (
                         driver.is_element_present('[name*="cf-turnstile-"]')

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.30.0
+Version: 4.30.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -68,7 +68,7 @@ Requires-Dist: setuptools>=70.2.0; python_version >= "3.10"
 Requires-Dist: wheel>=0.42.0; python_version < "3.8"
 Requires-Dist: wheel>=0.44.0; python_version >= "3.8"
 Requires-Dist: attrs>=24.2.0
-Requires-Dist: certifi>=2024.7.4
+Requires-Dist: certifi>=2024.8.30
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: filelock>=3.12.2; python_version < "3.8"
 Requires-Dist: filelock>=3.15.4; python_version >= "3.8"
@@ -158,7 +158,7 @@ Provides-Extra: pdfminer
 Requires-Dist: pdfminer.six==20221105; python_version < "3.8" and extra == "pdfminer"
 Requires-Dist: pdfminer.six==20240706; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: cryptography==39.0.2; python_version < "3.9" and extra == "pdfminer"
-Requires-Dist: cryptography==43.0.0; python_version >= "3.9" and extra == "pdfminer"
+Requires-Dist: cryptography==43.0.1; python_version >= "3.9" and extra == "pdfminer"
 Requires-Dist: cffi==1.15.1; python_version < "3.8" and extra == "pdfminer"
 Requires-Dist: cffi==1.17.0; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: pycparser==2.22; extra == "pdfminer"

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/seleniumbase.egg-info/requires.txt

@@ -1,5 +1,5 @@
 attrs>=24.2.0
-certifi>=2024.7.4
+certifi>=2024.8.30
 exceptiongroup>=1.2.2
 parse>=1.20.2
 parse-type>=0.6.3
@@ -136,7 +136,7 @@ pdfminer.six==20240706
 cffi==1.17.0
 
 [pdfminer:python_version >= "3.9"]
-cryptography==43.0.0
+cryptography==43.0.1
 
 [pillow]
 

{seleniumbase-4.30.0 → seleniumbase-4.30.2}/setup.py

@@ -156,7 +156,7 @@ setup(
         'wheel>=0.42.0;python_version<"3.8"',
         'wheel>=0.44.0;python_version>="3.8"',
         'attrs>=24.2.0',
-        "certifi>=2024.7.4",
+        "certifi>=2024.8.30",
         "exceptiongroup>=1.2.2",
         'filelock>=3.12.2;python_version<"3.8"',
         'filelock>=3.15.4;python_version>="3.8"',
@@ -263,7 +263,7 @@ setup(
             'pdfminer.six==20221105;python_version<"3.8"',
             'pdfminer.six==20240706;python_version>="3.8"',
             'cryptography==39.0.2;python_version<"3.9"',
-            'cryptography==43.0.0;python_version>="3.9"',
+            'cryptography==43.0.1;python_version>="3.9"',
             'cffi==1.15.1;python_version<"3.8"',
             'cffi==1.17.0;python_version>="3.8"',
             "pycparser==2.22",