Merge pull request #1110 from seleniumbase/options-dependencies-and-docs

Update dependencies, default options, and docs

Author: mdmintz

README.md

@@ -306,6 +306,7 @@ The code above will leave your browser window open in case there's a failure. (i
 --port=PORT  # (The Selenium Grid port used by the test server.)
 --proxy=SERVER:PORT  # (Connect to a proxy server:port for tests.)
 --proxy=USERNAME:PASSWORD@SERVER:PORT  # (Use authenticated proxy server.)
+--proxy-bypass-list=STRING  # (";"-separated hosts to bypass, Eg "*.foo.com")
 --agent=STRING  # (Modify the web browser's User-Agent string.)
 --mobile  # (Use the mobile device emulator while running tests.)
 --metrics=STRING  # (Set mobile metrics: "CSSWidth,CSSHeight,PixelRatio".)

examples/test_download_files.py

@@ -60,10 +60,12 @@ def test_download_files(self):
 
         # Get file sizes in kB to compare actual values with displayed values
         whl_file_kb = whl_file_bytes / 1000.0
-        whl_line = self.get_text("tbody tr:nth-of-type(1) th")
+        whl_line_fi = self.get_text('a[href$=".whl"]')
+        whl_line = self.get_text('tbody th:contains("%s")' % whl_line_fi)
         whl_display_kb = float(whl_line.split("(")[1].split(" ")[0])
         tar_gz_file_kb = tar_gz_file_bytes / 1000.0
-        tar_gz_line = self.get_text("tbody tr:nth-of-type(2) th")
+        tar_gz_line_fi = self.get_text('a[href$=".tar.gz"]')
+        tar_gz_line = self.get_text('tbody th:contains("%s")' % tar_gz_line_fi)
         tar_gz_display_kb = float(tar_gz_line.split("(")[1].split(" ")[0])
 
         # Verify downloaded files are the correct size (account for rounding)

help_docs/customizing_test_runs.md

@@ -120,6 +120,7 @@ SeleniumBase provides additional ``pytest`` command-line options for tests:
 --port=PORT  # (The Selenium Grid port used by the test server.)
 --proxy=SERVER:PORT  # (Connect to a proxy server:port for tests.)
 --proxy=USERNAME:PASSWORD@SERVER:PORT  # (Use authenticated proxy server.)
+--proxy-bypass-list=STRING  # (";"-separated hosts to bypass, Eg "*.foo.com")
 --agent=STRING  # (Modify the web browser's User-Agent string.)
 --mobile  # (Use the mobile device emulator while running tests.)
 --metrics=STRING  # (Set mobile metrics: "CSSWidth,CSSHeight,PixelRatio".)

mkdocs_build/requirements.txt

@@ -21,7 +21,7 @@ lunr==0.6.1;python_version>="3.6"
 nltk==3.6.5;python_version>="3.6"
 watchdog==2.1.6;python_version>="3.6"
 mkdocs==1.2.3;python_version>="3.6"
-mkdocs-material==8.0.3;python_version>="3.6"
+mkdocs-material==8.0.5;python_version>="3.6"
 mkdocs-exclude-search==0.5.4;python_version>="3.6"
 mkdocs-simple-hooks==0.1.3
 mkdocs-material-extensions==1.0.3;python_version>="3.6"

requirements.txt

@@ -4,7 +4,7 @@ packaging>=20.9;python_version<"3.6"
 packaging>=21.3;python_version>="3.6"
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
-setuptools>=59.4.0;python_version>="3.6"
+setuptools>=59.5.0;python_version>="3.6"
 setuptools-scm>=5.0.2;python_version<"3.6"
 setuptools-scm>=6.3.2;python_version>="3.6"
 tomli>=1.2.2;python_version>="3.6"
@@ -25,7 +25,7 @@ idna==2.10;python_version<"3.6"
 idna==3.3;python_version>="3.6"
 chardet==3.0.4;python_version<"3.5"
 chardet==4.0.0;python_version>="3.5"
-charset-normalizer==2.0.8;python_version>="3.5"
+charset-normalizer==2.0.9;python_version>="3.5"
 urllib3==1.26.7
 requests==2.26.0;python_version<"3.5"
 requests==2.25.1;python_version>="3.5" and python_version<"3.6"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.2.7"
+__version__ = "2.2.8"

seleniumbase/core/browser_launcher.py

@@ -507,7 +507,7 @@ def _set_firefox_options(
     options.set_preference("pdfjs.disabled", True)
     options.set_preference("app.update.auto", False)
     options.set_preference("app.update.enabled", False)
-    options.set_preference("app.update.silent", True)
+    options.set_preference("app.update.silent", False)
     options.set_preference("browser.formfill.enable", False)
     options.set_preference("browser.privatebrowsing.autostart", False)
     options.set_preference("devtools.errorconsole.enabled", True)
@@ -519,7 +519,7 @@ def _set_firefox_options(
     options.set_preference("extensions.systemAddon.update.enabled", False)
     options.set_preference("extensions.update.autoUpdateDefault", False)
     options.set_preference("extensions.update.enabled", False)
-    options.set_preference("extensions.update.silent", True)
+    options.set_preference("extensions.update.silent", False)
     options.set_preference("datareporting.healthreport.service.enabled", False)
     options.set_preference("datareporting.healthreport.uploadEnabled", False)
     options.set_preference("datareporting.policy.dataSubmissionEnabled", False)

seleniumbase/fixtures/base_case.py

@@ -2716,8 +2716,7 @@ def get_new_driver(
         servername - if using a Selenium Grid, set the host address here
         port - if using a Selenium Grid, set the host port here
         proxy - if using a proxy server, specify the "host:port" combo here
-        proxy_bypass_list - Semi-colon  seperated string of domains to not
-                            use a proxy for or * to bypass all
+        proxy_bypass_list - ";"-separated hosts to bypass (Eg. "*.foo.com")
         switch_to - the option to switch to the new driver (default = True)
         cap_file - the file containing desired capabilities for the browser
         cap_string - the string with desired capabilities for the browser

seleniumbase/plugins/pytest_plugin.py

@@ -37,8 +37,7 @@ def pytest_addoption(parser):
     --cap-string=STRING  (The web browser's desired capabilities to use.)
     --proxy=SERVER:PORT  (Connect to a proxy server:port for tests.)
     --proxy=USERNAME:PASSWORD@SERVER:PORT  (Use authenticated proxy server.)
-    --proxy-bypass-list=STRING (Semi-colon  seperated string of domains to not
-                                use a proxy for or * to bypass all)
+    --proxy-bypass-list=STRING (";"-separated hosts to bypass, Eg "*.foo.com")
     --agent=STRING  (Modify the web browser's User-Agent string.)
     --mobile  (Use the mobile device emulator while running tests.)
     --metrics=STRING  (Set mobile metrics: "CSSWidth,CSSHeight,PixelRatio".)
@@ -388,14 +387,21 @@ def pytest_addoption(parser):
     )
     parser.addoption(
         "--proxy-bypass-list",
+        "--proxy_bypass_list",
         action="store",
         dest="proxy_bypass_list",
         default=None,
-        help="""Designates the domains or IP address to bypass the defined proxy.
-                Format: example.test  OR
-                example.test,anothorexample.test  OR
-                *
-                Default: ''.""",
+        help="""Designates the hosts, domains, and/or IP addresses
+                to bypass when using a proxy server with "--proxy".
+                Format: A ";"-separated string.
+                Example usage:
+                    pytest
+                        --proxy="username:password@servername:port"
+                        --proxy-bypass-list="*.foo.com;github.com"
+                    pytest
+                        --proxy="servername:port"
+                        --proxy-bypass-list="127.0.0.1:8080"
+                Default: None.""",
     )
     parser.addoption(
         "--agent",

seleniumbase/plugins/selenium_plugin.py

@@ -21,8 +21,7 @@ class SeleniumBrowser(Plugin):
     --cap-string=STRING  (The web browser's desired capabilities to use.)
     --proxy=SERVER:PORT  (Connect to a proxy server:port for tests.)
     --proxy=USERNAME:PASSWORD@SERVER:PORT  (Use authenticated proxy server.)
-    --proxy-bypass-list=STRING (Semi-colon seperated string of domains to not
-                                use a proxy for or * to bypass all)
+    --proxy-bypass-list=STRING (";"-separated hosts to bypass, Eg "*.foo.com")
     --agent=STRING  (Modify the web browser's User-Agent string.)
     --mobile  (Use the mobile device emulator while running tests.)
     --metrics=STRING  (Set mobile metrics: "CSSWidth,CSSHeight,PixelRatio".)
@@ -161,14 +160,21 @@ def options(self, parser, env):
         )
         parser.add_option(
             "--proxy-bypass-list",
+            "--proxy_bypass_list",
             action="store",
             dest="proxy_bypass_list",
             default=None,
-            help="""Designates the domains or IP address to bypass the defined proxy.
-                    Format: example.test  OR
-                    example.test,anothorexample.test  OR
-                    *
-                    Default: ''.""",
+            help="""Designates the hosts, domains, and/or IP addresses
+                    to bypass when using a proxy server with "--proxy".
+                    Format: A ";"-separated string.
+                    Example usage:
+                        pytest
+                            --proxy="username:password@servername:port"
+                            --proxy-bypass-list="*.foo.com;github.com"
+                        pytest
+                            --proxy="servername:port"
+                            --proxy-bypass-list="127.0.0.1:8080"
+                    Default: None.""",
         )
         parser.add_option(
             "--agent",