Merge pull request #1668 from seleniumbase/bug-fixes-and-updates-2

Bug fixes and updates

Author: mdmintz

.github/workflows/python-package.yml

@@ -40,18 +40,16 @@ jobs:
         pip install flake8
         # Stop the build if there are flake8 issues
         flake8 . --count --show-source --statistics --exclude=temp
-    - name: Install Chrome and Firefox
+    - name: Install Chrome
       run: |
         sudo apt install google-chrome-stable
-        sudo apt-get install firefox
     - name: Check the console scripts interface
       run: |
         seleniumbase
         sbase
-    - name: Install chromedriver and geckodriver (Firefox Webdriver)
+    - name: Install chromedriver
       run: |
         seleniumbase install chromedriver
-        seleniumbase install geckodriver
     - name: Make sure pytest is working
       run: |
         echo "def test_1(): pass" > nothing.py
@@ -87,12 +85,6 @@ jobs:
     - name: Run pytest examples/test_inspect_html.py --browser=chrome --headless
       run: |
         pytest examples/test_inspect_html.py --browser=chrome --headless -v -s --junit-xml=junit/test-results.xml
-    - name: Run pytest examples/test_mfa_login.py --browser=firefox --headless
-      run: |
-        pytest examples/test_mfa_login.py --browser=firefox --headless -v -s --junit-xml=junit/test-results.xml
-    - name: Run pytest examples/test_mfa_login.py --browser=firefox --xvfb
-      run: |
-        pytest examples/test_mfa_login.py --browser=firefox --xvfb -v -s --junit-xml=junit/test-results.xml
     - name: Run behave examples/behave_bdd/features/calculator.feature -D rs -D crumbs -D xvfb
       run: |
         behave examples/behave_bdd/features/calculator.feature -D rs -D crumbs -D xvfb -T -k

examples/test_download_files.py

@@ -41,11 +41,7 @@ def test_download_files_from_pypi(self):
             self.browser == "safari"
             or self.browser == "ie"
             or (self.is_chromium() and self.guest_mode and not self.headless)
-            or (
-                self.browser == "chrome"
-                and self.is_chromedriver_too_old()
-                and self.headless
-            )
+            or (self.undetectable and (self.headless or self.headless2))
         ):
             whl_href = self.get_attribute(whl_selector, "href")
             tar_href = self.get_attribute(tar_selector, "href")

examples/wordle_test.py

@@ -71,10 +71,10 @@ def test_wordle(self):
             button = 'button[class*="oneAndAHalf"]'
             self.click(button)
             row = (
-                'div[class*="lbzlf"] div[class*="Row-module"]:nth-of-type(%s) '
+                'div[class*="Board"] div[class*="Row-module"]:nth-of-type(%s) '
                 % num_attempts
             )
-            tile = row + 'div:nth-child(%s) div[class*="module_tile__3ayIZ"]'
+            tile = row + 'div:nth-child(%s) div[class*="module_tile__"]'
             self.wait_for_element(tile % "5" + '[data-state$="t"]')
             self.wait_for_element(tile % "5" + '[data-animation="idle"]')
             letter_status = []

mkdocs_build/requirements.txt

@@ -2,7 +2,7 @@
 # Minimum Python version: 3.8 (for generating docs only)
 
 regex>=2022.10.31
-pkginfo>=1.9.3
+pkginfo>=1.9.6
 docutils==0.19
 python-dateutil==2.8.2
 livereload==2.6.3
@@ -15,7 +15,7 @@ click==8.1.3
 zipp==3.11.0
 ghp-import==2.1.0
 readme-renderer==37.3
-pymdown-extensions==9.9
+pymdown-extensions==9.9.1
 importlib-metadata==6.0.0
 pipdeptree==2.3.3
 bleach==5.0.1
@@ -24,12 +24,12 @@ nltk==3.8.1
 tornado==6.2
 watchdog==2.2.1
 cairocffi==1.4.0
-cairosvg==2.5.2
+cairosvg==2.6.0
 cssselect2==0.7.0
 tinycss2==1.2.1
 defusedxml==0.7.1
 mkdocs==1.4.2
-mkdocs-material==9.0.2
+mkdocs-material==9.0.4
 mkdocs-exclude-search==0.6.4
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1.1

requirements.txt

@@ -1,9 +1,9 @@
 pip>=21.3.1;python_version>="3.6" and python_version<"3.7"
 pip>=22.3.1;python_version>="3.7"
 packaging>=21.3;python_version>="3.6" and python_version<"3.7"
-packaging>=22.0;python_version>="3.7"
+packaging>=23.0;python_version>="3.7"
 setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"
-setuptools>=65.6.3;python_version>="3.7"
+setuptools>=65.7.0;python_version>="3.7"
 tomli>=1.2.3;python_version>="3.6" and python_version<"3.7"
 tomli>=2.0.1;python_version>="3.7"
 tqdm>=4.64.1
@@ -23,12 +23,12 @@ six==1.16.0
 idna==3.4;python_version>="3.6"
 chardet==4.0.0;python_version>="3.6" and python_version<"3.7"
 chardet==5.1.0;python_version>="3.7"
-charset-normalizer==2.0.12;python_version>="3.6" and python_version<"3.7"
-charset-normalizer==2.1.1;python_version>="3.7"
+charset-normalizer==2.0.12;python_version<"3.7"
+charset-normalizer==3.0.1;python_version>="3.7"
 urllib3==1.26.12;python_version<"3.7"
-urllib3==1.26.13;python_version>="3.7"
+urllib3==1.26.14;python_version>="3.7"
 requests==2.27.1;python_version<"3.7"
-requests==2.28.1;python_version>="3.7"
+requests==2.28.2;python_version>="3.7"
 requests-toolbelt==0.10.1
 nose==1.3.7
 sniffio==1.3.0;python_version>="3.7"
@@ -50,17 +50,20 @@ sortedcontainers==2.4.0
 fasteners==0.17.3;python_version>="3.6" and python_version<"3.7"
 fasteners==0.18;python_version>="3.7"
 execnet==1.9.0
+iniconfig==1.1.1;python_version<"3.7"
+iniconfig==2.0.0;python_version>="3.7"
 pluggy==1.0.0;python_version>="3.6"
 py==1.11.0;python_version>="3.6"
-pytest==7.0.1;python_version>="3.6" and python_version<"3.7"
+pytest==7.0.1;python_version<"3.7"
 pytest==7.2.0;python_version>="3.7"
 pytest-forked==1.4.0;python_version>="3.6"
 pytest-html==2.0.1;python_version>="3.6"
-pytest-metadata==1.11.0;python_version>="3.6" and python_version<"3.7"
+pytest-metadata==1.11.0;python_version<"3.7"
 pytest-metadata==2.0.4;python_version>="3.7"
 pytest-ordering==0.6
-pytest-rerunfailures==10.3;python_version>="3.6"
-pytest-xdist==2.5.0;python_version>="3.6" and python_version<"3.7"
+pytest-rerunfailures==10.3;python_version<"3.7"
+pytest-rerunfailures==11.0;python_version>="3.7"
+pytest-xdist==2.5.0;python_version<"3.7"
 pytest-xdist==3.1.0;python_version>="3.7"
 parameterized==0.8.1
 sbvirtualdisplay==1.1.1
@@ -86,13 +89,13 @@ cffi==1.15.1
 typing-extensions==4.1.1;python_version>="3.6" and python_version<"3.7"
 typing-extensions==4.4.0;python_version>="3.7" and python_version<"3.9"
 rich==12.6.0;python_version>="3.6" and python_version<"3.7"
-rich==13.0.0;python_version>="3.7" and python_version<"4.0"
+rich==13.0.1;python_version>="3.7" and python_version<"4.0"
 
 # --- Testing Requirements --- #
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)
 
 coverage==6.2;python_version>="3.6" and python_version<"3.7"
-coverage==7.0.3;python_version>="3.7"
+coverage==7.0.5;python_version>="3.7"
 pytest-cov==4.0.0;python_version>="3.6"
 flake8==5.0.4;python_version>="3.6" and python_version<"3.9"
 flake8==6.0.0;python_version>="3.9"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.11.2"
+__version__ = "4.11.3"

seleniumbase/console_scripts/sb_install.py

@@ -51,6 +51,10 @@
     )
 ):
     IS_ARM_MAC = True
+PLAT = sys.platform
+IS_WINDOWS = False
+if "win32" in PLAT or "win64" in PLAT or "x64" in PLAT or "x86" in PLAT:
+    IS_WINDOWS = True
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 LOCAL_PATH = "/usr/local/bin/"  # On Mac and Linux systems
 DEFAULT_CHROMEDRIVER_VERSION = "72.0.3626.69"  # (If can't find LATEST_STABLE)
@@ -249,7 +253,7 @@ def main(override=None, intel_for_uc=None):
                 file_name = "chromedriver_mac64.zip"
         elif "linux" in sys_plat:
             file_name = "chromedriver_linux64.zip"
-        elif "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
+        elif IS_WINDOWS:
             file_name = "chromedriver_win32.zip"  # Works for win32 / win_x64
             if not get_latest and not get_v_latest and num_args < 4:
                 get_latest = True
@@ -348,7 +352,7 @@ def main(override=None, intel_for_uc=None):
                 file_name = "geckodriver-%s-linux64.tar.gz" % use_version
             else:
                 file_name = "geckodriver-%s-linux32.tar.gz" % use_version
-        elif "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
+        elif IS_WINDOWS:
             file_name = "geckodriver-%s-win64.zip" % use_version
         else:
             raise Exception(
@@ -546,6 +550,9 @@ def main(override=None, intel_for_uc=None):
     if not os.path.exists(downloads_folder):
         os.makedirs(downloads_folder)
 
+    driver_name = None  # The name of the driver executable
+    driver_contents = []  # The contents of the driver zip file
+
     if headless_ie_exists:
         headless_ie_file_path = os.path.join(
             downloads_folder, headless_ie_file_name
@@ -641,10 +648,20 @@ def main(override=None, intel_for_uc=None):
         zip_file_path = file_path
         zip_ref = zipfile.ZipFile(zip_file_path, "r")
         contents = zip_ref.namelist()
-        if len(contents) == 1:
-            if name == "operadriver":
-                raise Exception("Zip file for OperaDriver is missing content!")
+        if (
+            len(contents) >= 1
+            and name in ["chromedriver", "uc_driver"]
+        ):
             for f_name in contents:
+                if (
+                    name == "chromedriver"
+                    and (
+                        f_name == "chromedriver"
+                        or f_name == "chromedriver.exe"
+                    )
+                ):
+                    driver_name = f_name
+                    driver_contents = [driver_name]
                 # Remove existing version if exists
                 new_file = os.path.join(downloads_folder, str(f_name))
                 if (
@@ -658,6 +675,8 @@ def main(override=None, intel_for_uc=None):
                 if "Driver" in new_file or "driver" in new_file:
                     if os.path.exists(new_file):
                         os.remove(new_file)  # Technically the old file now
+            if driver_contents:
+                contents = driver_contents
             print("Extracting %s from %s ..." % (contents, file_name))
             if intel_for_uc and IS_ARM_MAC:
                 f_name = "uc_driver"
@@ -670,12 +689,30 @@ def main(override=None, intel_for_uc=None):
                         zipinfo.filename = "uc_driver"
                         zip_ref.extract(zipinfo, downloads_folder)
                 contents = zip_ref.namelist()
+                if driver_contents:
+                    contents = driver_contents
+            elif name == "chromedriver":
+                zipinfos = zip_ref.infolist()
+                for zipinfo in zipinfos:
+                    if (
+                        zipinfo.filename == "chromedriver"
+                        or zipinfo.filename == "chromedriver.exe"
+                    ):
+                        zip_ref.extract(zipinfo, downloads_folder)
+                contents = zip_ref.namelist()
+                if driver_contents:
+                    contents = driver_contents
             else:
                 zip_ref.extractall(downloads_folder)
             zip_ref.close()
             os.remove(zip_file_path)
             print("%sUnzip Complete!%s\n" % (c2, cr))
             for f_name in contents:
+                if intel_for_uc:
+                    if IS_WINDOWS:
+                        f_name = "uc_driver.exe"
+                    else:
+                        f_name = "uc_driver"
                 new_file = os.path.join(downloads_folder, str(f_name))
                 pr_file = c3 + new_file + cr
                 print("The file [%s] was saved to:\n%s\n" % (f_name, pr_file))

seleniumbase/core/browser_launcher.py

@@ -986,6 +986,8 @@ def get_driver(
     if is_using_uc(undetectable, browser_name) and mobile_emulator:
         mobile_emulator = False
         user_agent = None
+    if page_load_strategy and page_load_strategy.lower() == "none":
+        settings.PAGE_LOAD_STRATEGY = "none"
     proxy_auth = False
     proxy_user = None
     proxy_pass = None