Merge pull request #1854 from seleniumbase/update-geckodriver-and-fix-masterqa

Update geckodriver and fix MasterQA Mode

Author: mdmintz

.travis.yml

@@ -22,7 +22,7 @@ install:
 before_script:
   - "flake8 --exclude=temp"
   # - "wget https://chromedriver.storage.googleapis.com/72.0.3626.69/chromedriver_linux64.zip && unzip chromedriver_linux64.zip && sudo cp chromedriver /usr/local/bin/ && sudo chmod +x /usr/local/bin/chromedriver"
-  # - "wget https://github.com/mozilla/geckodriver/releases/download/v0.32.0/geckodriver-v0.32.0-linux64.tar.gz -O /tmp/geckodriver.tar.gz && tar -C /opt -xzf /tmp/geckodriver.tar.gz && sudo chmod 755 /opt/geckodriver && sudo ln -fs /opt/geckodriver /usr/bin/geckodriver && sudo ln -fs /opt/geckodriver /usr/local/bin/geckodriver"
+  # - "wget https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz -O /tmp/geckodriver.tar.gz && tar -C /opt -xzf /tmp/geckodriver.tar.gz && sudo chmod 755 /opt/geckodriver && sudo ln -fs /opt/geckodriver /usr/bin/geckodriver && sudo ln -fs /opt/geckodriver /usr/local/bin/geckodriver"
   - "seleniumbase"
   - "seleniumbase install chromedriver"
   # - "seleniumbase install geckodriver"

Dockerfile

@@ -88,8 +88,8 @@ RUN cd /SeleniumBase && pip3 install .
 #=====================
 # Download WebDrivers
 #=====================
-RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.32.2/geckodriver-v0.32.2-linux64.tar.gz
-RUN tar -xvzf geckodriver-v0.32.2-linux64.tar.gz
+RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz
+RUN tar -xvzf geckodriver-v0.33.0-linux64.tar.gz
 RUN chmod +x geckodriver
 RUN mv geckodriver /usr/local/bin/
 RUN wget https://chromedriver.storage.googleapis.com/72.0.3626.69/chromedriver_linux64.zip

help_docs/webdriver_installation.md

@@ -19,11 +19,11 @@ If the necessary driver is not found in this location while running tests, Selen
 * You can also download specific versions of drivers. Examples:
 
 ```bash
-sbase get chromedriver 107
-sbase get chromedriver 107.0.5304.62
+sbase get chromedriver 112
+sbase get chromedriver 112.0.5615.49
 sbase get chromedriver latest
 sbase get chromedriver latest-1
-sbase get edgedriver 106.0.1370.42
+sbase get edgedriver 112.0.1722.58
 ```
 
 (NOTE: ``sbase`` is a shortcut for ``seleniumbase``)
@@ -72,8 +72,8 @@ chmod +x /usr/local/bin/chromedriver
 ```
 
 ```bash
-wget https://github.com/mozilla/geckodriver/releases/download/v0.32.0/geckodriver-v0.32.0-linux64.tar.gz
-tar xvfz geckodriver-v0.32.0-linux64.tar.gz
+wget https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz
+tar xvfz geckodriver-v0.33.0-linux64.tar.gz
 mv geckodriver /usr/local/bin/
 chmod +x /usr/local/bin/geckodriver
 ```

requirements.txt

@@ -3,7 +3,7 @@ pip>=23.1;python_version>="3.7"
 packaging>=21.3;python_version<"3.7"
 packaging>=23.1;python_version>="3.7"
 setuptools>=59.6.0;python_version<"3.7"
-setuptools>=67.7.0;python_version>="3.7"
+setuptools>=67.7.1;python_version>="3.7"
 keyring>=23.4.1;python_version<"3.8"
 keyring>=23.13.1;python_version>="3.8"
 tomli>=1.2.3;python_version<"3.7"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.14.0"
+__version__ = "4.14.1"

seleniumbase/console_scripts/run.py

@@ -144,8 +144,8 @@ def show_install_usage():
     print("           sbase get chromedriver")
     print("           sbase get geckodriver")
     print("           sbase get edgedriver")
-    print("           sbase get chromedriver 109")
-    print("           sbase get chromedriver 109.0.5414.74")
+    print("           sbase get chromedriver 112")
+    print("           sbase get chromedriver 112.0.5615.49")
     print("           sbase get chromedriver latest")
     print("           sbase get chromedriver latest-1")
     print("           sbase get chromedriver -p")

seleniumbase/console_scripts/sb_install.py

@@ -14,8 +14,8 @@
          sbase get chromedriver
          sbase get geckodriver
          sbase get edgedriver
-         sbase get chromedriver 109
-         sbase get chromedriver 109.0.5414.74
+         sbase get chromedriver 112
+         sbase get chromedriver 112.0.5615.49
          sbase get chromedriver latest
          sbase get chromedriver latest-1  # (Latest minus one)
          sbase get chromedriver -p
@@ -60,8 +60,8 @@
 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)
-DEFAULT_GECKODRIVER_VERSION = "v0.32.2"
-DEFAULT_EDGEDRIVER_VERSION = "109.0.1518.52"  # (If can't find LATEST_STABLE)
+DEFAULT_GECKODRIVER_VERSION = "v0.33.0"
+DEFAULT_EDGEDRIVER_VERSION = "112.0.1722.58"  # (If can't find LATEST_STABLE)
 DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
 
 
@@ -86,8 +86,8 @@ def invalid_run_command():
     exp += "           sbase get chromedriver\n"
     exp += "           sbase get geckodriver\n"
     exp += "           sbase get edgedriver\n"
-    exp += "           sbase get chromedriver 109\n"
-    exp += "           sbase get chromedriver 109.0.5414.74\n"
+    exp += "           sbase get chromedriver 112\n"
+    exp += "           sbase get chromedriver 112.0.5615.49\n"
     exp += "           sbase get chromedriver latest\n"
     exp += "           sbase get chromedriver latest-1\n"
     exp += "           sbase get chromedriver -p\n"

seleniumbase/fixtures/base_case.py

@@ -12858,7 +12858,7 @@ def __get_shadow_element(
             shadow_root = None
             if (
                 selenium4_or_newer
-                and self.is_chromium()
+                and (self.is_chromium() or self.browser == "firefox")
                 and int(self.__get_major_browser_version()) >= 96
             ):
                 try:
@@ -12928,7 +12928,7 @@ def __get_shadow_element(
             try:
                 if (
                     selenium4_or_newer
-                    and self.is_chromium()
+                    and (self.is_chromium() or self.browser == "firefox")
                     and int(self.__get_major_browser_version()) >= 96
                 ):
                     if timeout == 0.1:

seleniumbase/masterqa/master_qa.py

@@ -191,7 +191,8 @@ def __manual_page_check(self, *args):
             get_jqc = None
             try:
                 get_jqc = self.execute_script("return jconfirm")
-                get_jqc = get_jqc["instances"]
+                if get_jqc is None:
+                    raise Exception("jconfirm did not load")
                 use_jqc = True
             except Exception:
                 use_jqc = False

setup.py

@@ -127,7 +127,7 @@
         'packaging>=21.3;python_version<"3.7"',
         'packaging>=23.1;python_version>="3.7"',
         'setuptools>=59.6.0;python_version<"3.7"',
-        'setuptools>=67.7.0;python_version>="3.7"',
+        'setuptools>=67.7.1;python_version>="3.7"',
         'keyring>=23.4.1;python_version<"3.8"',
         'keyring>=23.13.1;python_version>="3.8"',
         'tomli>=1.2.3;python_version<"3.7"',