Merge pull request #854 from seleniumbase/update-firefox-settings

Update Firefox settings on Linux and update dependencies

Author: mdmintz

docs/requirements.txt

@@ -1,8 +1,9 @@
-regex>=2021.3.17
-tqdm>=4.59.0
+regex>=2021.4.4
+tqdm>=4.60.0
 livereload==2.6.3;python_version>="3.6"
 joblib==1.0.1;python_version>="3.6"
 Markdown==3.3.4
+docutils==0.17
 Jinja2==2.11.3
 readme-renderer==29.0
 pymdown-extensions==8.1.1

requirements.txt

@@ -33,7 +33,7 @@ py==1.8.1;python_version<"3.5"
 py==1.10.0;python_version>="3.5"
 pytest==4.6.11;python_version<"3.5"
 pytest==6.1.2;python_version>="3.5" and python_version<"3.6"
-pytest==6.2.2;python_version>="3.6"
+pytest==6.2.3;python_version>="3.6"
 pytest-forked==1.3.0
 pytest-html==1.22.1;python_version<"3.6"
 pytest-html==2.0.1;python_version>="3.6"
@@ -79,7 +79,7 @@ toml==0.10.2
 Pillow==6.2.2;python_version<"3.5"
 Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"
 Pillow==8.2.0;python_version>="3.6"
-rich==10.0.1;python_version>="3.6" and python_version<"4.0"
+rich==10.1.0;python_version>="3.6" and python_version<"4.0"
 tornado==5.1.1;python_version<"3.5"
 tornado==6.1;python_version>="3.5"
 pdfminer.six==20191110;python_version<"3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.59.5"
+__version__ = "1.59.6"

seleniumbase/core/browser_launcher.py

@@ -381,7 +381,7 @@ def _set_firefox_options(
         options.set_preference("security.csp.enable", False)
     options.set_preference(
         "browser.download.manager.showAlertOnComplete", False)
-    if headless:
+    if headless and "linux" not in PLATFORM:
         options.add_argument("--headless")
     if locale_code:
         options.set_preference("intl.accept_languages", locale_code)
@@ -579,6 +579,11 @@ def get_remote_driver(
             downloads_path, headless, locale_code,
             proxy_string, user_agent, disable_csp)
         capabilities = firefox_options.to_capabilities()
+        capabilities['marionette'] = True
+        if "linux" in PLATFORM:
+            if headless:
+                capabilities['moz:firefoxOptions'] = (
+                    {'args': ['-headless']})
         for key in desired_caps.keys():
             capabilities[key] = desired_caps[key]
         warnings.simplefilter("ignore", category=DeprecationWarning)
@@ -703,7 +708,19 @@ def get_local_driver(
                           "%s" % e)
                 sys.argv = sys_args  # Put back the original sys args
         warnings.simplefilter("ignore", category=DeprecationWarning)
-        return webdriver.Firefox(options=firefox_options)
+        if "linux" in PLATFORM:
+            from selenium.webdriver.common.desired_capabilities import (
+                DesiredCapabilities)
+            firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
+            firefox_capabilities['marionette'] = True
+            if headless:
+                firefox_capabilities['moz:firefoxOptions'] = (
+                    {'args': ['-headless']})
+            return webdriver.Firefox(
+                capabilities=firefox_capabilities,
+                options=firefox_options)
+        else:
+            return webdriver.Firefox(options=firefox_options)
     elif browser_name == constants.Browser.INTERNET_EXPLORER:
         if not IS_WINDOWS:
             raise Exception(

setup.py

@@ -51,7 +51,7 @@
         print("\n*** Installing twine: *** (Required for PyPI uploads)\n")
         os.system("python -m pip install --upgrade 'twine>=1.15.0'")
         print("\n*** Installing tqdm: *** (Required for PyPI uploads)\n")
-        os.system("python -m pip install --upgrade 'tqdm>=4.59.0'")
+        os.system("python -m pip install --upgrade 'tqdm>=4.60.0'")
         print("\n*** Publishing The Release to PyPI: ***\n")
         os.system('python -m twine upload dist/*')  # Requires ~/.pypirc Keys
         print("\n*** The Release was PUBLISHED SUCCESSFULLY to PyPI! :) ***\n")
@@ -139,7 +139,7 @@
         'py==1.10.0;python_version>="3.5"',
         'pytest==4.6.11;python_version<"3.5"',
         'pytest==6.1.2;python_version>="3.5" and python_version<"3.6"',
-        'pytest==6.2.2;python_version>="3.6"',
+        'pytest==6.2.3;python_version>="3.6"',
         'pytest-forked==1.3.0',
         'pytest-html==1.22.1;python_version<"3.6"',
         'pytest-html==2.0.1;python_version>="3.6"',
@@ -185,7 +185,7 @@
         'Pillow==6.2.2;python_version<"3.5"',
         'Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"',
         'Pillow==8.2.0;python_version>="3.6"',
-        'rich==10.0.1;python_version>="3.6" and python_version<"4.0"',
+        'rich==10.1.0;python_version>="3.6" and python_version<"4.0"',
         'tornado==5.1.1;python_version<"3.5"',
         'tornado==6.1;python_version>="3.5"',
         'pdfminer.six==20191110;python_version<"3.5"',