Merge pull request #907 from seleniumbase/protocol-option-for-grid

mdmintz · web-flow · commit dd54fd3b3a9a · 2021-05-18T14:45:22.000-04:00
Add "protocol" option for selecting a Selenium Grid server
diff --git a/README.md b/README.md
@@ -350,6 +350,7 @@ The code above will leave your browser window open in case there's a failure. (i
 --var2=DATA  # (Extra test data. Access with "self.var2" in tests.)
 --var3=DATA  # (Extra test data. Access with "self.var3" in tests.)
 --user-data-dir=DIR  # (Set the Chrome user data directory to use.)
+--protocol=PROTOCOL  # (The Selenium Grid protocol: http|https.)
 --server=SERVER  # (The Selenium Grid server/IP used for tests.)
 --port=PORT  # (The Selenium Grid port used by the test server.)
 --proxy=SERVER:PORT  # (Connect to a proxy server:port for tests.)
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -2,7 +2,8 @@ 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
+Markdown==3.3.4;python_version>="3.6"
+MarkupSafe==2.0.1;python_version>="3.6"
 docutils==0.17.1
 Jinja2==3.0.0;python_version>="3.6"
 click==8.0.0
diff --git a/examples/raw_parameter_script.py b/examples/raw_parameter_script.py
@@ -35,6 +35,7 @@
     sb.headed = False
     sb.start_page = None
     sb.locale_code = None
+    sb.protocol = "http"
     sb.servername = "localhost"
     sb.port = 4444
     sb.data = None
diff --git a/examples/test_hack_search.py b/examples/test_hack_search.py
@@ -13,8 +13,8 @@ def test_hack_search(self):
         self.set_attribute('[action="/search"]', "action", "//bing.com/search")
         self.set_attributes('[value="Google Search"]', "value", "Bing Search")
         self.type('input[title="Search"]', "SeleniumBase GitHub")
-        self.highlight('[value="Bing Search"]')
-        self.click('[value="Bing Search"]')
+        self.sleep(0.5)
+        self.js_click('[value="Bing Search"]')
         self.highlight("h1.b_logo")
         self.highlight_click('a[href*="github.com/seleniumbase/SeleniumBase"]')
         self.switch_to_newest_window()
diff --git a/help_docs/customizing_test_runs.md b/help_docs/customizing_test_runs.md
@@ -105,6 +105,7 @@ SeleniumBase provides additional ``pytest`` command-line options for tests:
 --var2=DATA  # (Extra test data. Access with "self.var2" in tests.)
 --var3=DATA  # (Extra test data. Access with "self.var3" in tests.)
 --user-data-dir=DIR  # (Set the Chrome user data directory to use.)
+--protocol=PROTOCOL  # (The Selenium Grid protocol: http|https.)
 --server=SERVER  # (The Selenium Grid server/IP used for tests.)
 --port=PORT  # (The Selenium Grid port used by the test server.)
 --proxy=SERVER:PORT  # (Connect to a proxy server:port for tests.)
diff --git a/integrations/brython/index.html b/integrations/brython/index.html
@@ -21,7 +21,7 @@
         padding: 8px;
     }
 </style>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.1/brython.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.2/brython.js"></script>
 </head>
 <body onload="brython()">
 <table>
diff --git a/integrations/brython/library.html b/integrations/brython/library.html
@@ -21,7 +21,7 @@
                 padding: 4px;
             }
         </style>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.1/brython.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.2/brython.js"></script>
     </head>
     <body onload="brython(1)">
         <script id="ascript" type="text/python">
diff --git a/requirements.txt b/requirements.txt
@@ -10,6 +10,7 @@ setuptools-scm>=6.0.1;python_version>="3.6"
 wheel>=0.36.2
 attrs>=21.2.0
 PyYAML>=5.4.1;python_version>="3.6"
+sortedcontainers==2.4.0
 certifi>=2020.12.5
 six==1.16.0
 nose==1.3.7
@@ -64,7 +65,7 @@ traitlets==5.0.5;python_version>="3.7"
 prompt-toolkit==1.0.18;python_version<"3.6"
 prompt-toolkit==3.0.18;python_version>="3.6"
 decorator==4.4.2;python_version<"3.5"
-decorator==5.0.7;python_version>="3.5"
+decorator==5.0.9;python_version>="3.5"
 ipython==5.10.0;python_version<"3.5"
 ipython==6.5.0;python_version>="3.5" and python_version<"3.6"
 ipython==7.16.1;python_version>="3.6" and python_version<"3.7"
@@ -83,7 +84,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.2.0;python_version>="3.6" and python_version<"4.0"
+rich==10.2.1;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"
@@ -93,7 +94,7 @@ pdfminer.six==20201018;python_version>="3.5"
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)
 
 coverage==5.5
-pytest-cov==2.11.1
+pytest-cov==2.12.0
 flake8==3.7.9;python_version<"3.5"
 flake8==3.9.2;python_version>="3.5"
 pyflakes==2.1.1;python_version<"3.5"
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.63.5"
+__version__ = "1.63.6"
diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py
@@ -536,6 +536,7 @@ def get_driver(
     headless=False,
     locale_code=None,
     use_grid=False,
+    protocol="http",
     servername="localhost",
     port=4444,
     proxy_string=None,
@@ -602,6 +603,7 @@ def get_driver(
             browser_name,
             headless,
             locale_code,
+            protocol,
             servername,
             port,
             proxy_string,
@@ -671,6 +673,7 @@ def get_remote_driver(
     browser_name,
     headless,
     locale_code,
+    protocol,
     servername,
     port,
     proxy_string,
@@ -703,7 +706,7 @@ def get_remote_driver(
     device_pixel_ratio,
 ):
     downloads_path = download_helper.get_downloads_folder()
-    address = "http://%s:%s/wd/hub" % (servername, port)
+    address = "%s://%s:%s/wd/hub" % (protocol, servername, port)
     desired_caps = {}
     extra_caps = {}
     if cap_file:
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
@@ -2206,6 +2206,7 @@ def get_new_driver(
         browser=None,
         headless=None,
         locale_code=None,
+        protocol=None,
         servername=None,
         port=None,
         proxy=None,
@@ -2242,6 +2243,7 @@ def get_new_driver(
         browser - the browser to use. (Ex: "chrome", "firefox")
         headless - the option to run webdriver in headless mode
         locale_code - the Language Locale Code for the web browser
+        protocol - if using a Selenium Grid, set the host protocol here
         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
@@ -2302,6 +2304,8 @@ def get_new_driver(
             headless = self.headless
         if locale_code is None:
             locale_code = self.locale_code
+        if protocol is None:
+            protocol = self.protocol
         if servername is None:
             servername = self.servername
         if port is None:
@@ -2375,6 +2379,7 @@ def get_new_driver(
             headless=headless,
             locale_code=locale_code,
             use_grid=use_grid,
+            protocol=protocol,
             servername=servername,
             port=port,
             proxy_string=proxy_string,
@@ -8367,6 +8372,7 @@ def setUp(self, masterqa_mode=False):
             self.with_page_source = sb_config.with_page_source
             self.with_db_reporting = sb_config.with_db_reporting
             self.with_s3_logging = sb_config.with_s3_logging
+            self.protocol = sb_config.protocol
             self.servername = sb_config.servername
             self.port = sb_config.port
             self.proxy_string = sb_config.proxy_string
@@ -8604,6 +8610,7 @@ def setUp(self, masterqa_mode=False):
                 browser=self.browser,
                 headless=self.headless,
                 locale_code=self.locale_code,
+                protocol=self.protocol,
                 servername=self.servername,
                 port=self.port,
                 proxy=self.proxy_string,
@@ -8941,6 +8948,7 @@ def __process_dashboard(self, has_exception, init=False):
         if not init:
             duration_ms = int(time.time() * 1000) - self.__start_time_ms
             duration = float(duration_ms) / 1000.0
+            duration = "{:.2f}".format(duration)
             sb_config._duration[test_id] = duration
             if (
                 has_exception
diff --git a/seleniumbase/fixtures/constants.py b/seleniumbase/fixtures/constants.py
@@ -385,6 +385,11 @@ class Browser:
     }
 
 
+class Protocol:
+    HTTP = "http"
+    HTTPS = "https"
+
+
 class State:
     PASSED = "Passed"
     FAILED = "Failed"
diff --git a/seleniumbase/plugins/pytest_plugin.py b/seleniumbase/plugins/pytest_plugin.py
@@ -33,6 +33,7 @@ def pytest_addoption(parser):
     --var2=DATA  (Extra test data. Access with "self.var2" in tests.)
     --var3=DATA  (Extra test data. Access with "self.var3" in tests.)
     --user-data-dir=DIR  (Set the Chrome user data directory to use.)
+    --protocol=PROTOCOL  (The Selenium Grid protocol: http|https.)
     --server=SERVER  (The Selenium Grid server/IP used for tests.)
     --port=PORT  (The Selenium Grid port used by the test server.)
     --cap-file=FILE  (The web browser's desired capabilities to use.)
@@ -334,6 +335,18 @@ def pytest_addoption(parser):
                 This option saves page source files on test failures.
                 (Automatically on when using --with-testing_base)""",
     )
+    parser.addoption(
+        "--protocol",
+        action="store",
+        dest="protocol",
+        choices=(
+            constants.Protocol.HTTP,
+            constants.Protocol.HTTPS,
+        ),
+        default=constants.Protocol.HTTP,
+        help="""Designates the Selenium Grid protocol to use.
+                Default: http.""",
+    )
     parser.addoption(
         "--server",
         action="store",
@@ -911,6 +924,7 @@ def pytest_configure(config):
     sb_config.with_screen_shots = config.getoption("with_screen_shots")
     sb_config.with_basic_test_info = config.getoption("with_basic_test_info")
     sb_config.with_page_source = config.getoption("with_page_source")
+    sb_config.protocol = config.getoption("protocol")
     sb_config.servername = config.getoption("servername")
     sb_config.port = config.getoption("port")
     sb_config.proxy_string = config.getoption("proxy_string")
diff --git a/seleniumbase/plugins/selenium_plugin.py b/seleniumbase/plugins/selenium_plugin.py
@@ -14,6 +14,7 @@ class SeleniumBrowser(Plugin):
     This plugin adds the following command-line options to nosetests:
     --browser=BROWSER  (The web browser to use. Default: "chrome".)
     --user-data-dir=DIR  (Set the Chrome user data directory to use.)
+    --protocol=PROTOCOL  (The Selenium Grid protocol: http|https.)
     --server=SERVER  (The Selenium Grid server/IP used for tests.)
     --port=PORT  (The Selenium Grid port used by the test server.)
     --cap-file=FILE  (The web browser's desired capabilities to use.)
@@ -111,6 +112,18 @@ def options(self, parser, env):
             help="""The Chrome User Data Directory to use. (Chrome Profile)
                     If the directory doesn't exist, it'll be created.""",
         )
+        parser.add_option(
+            "--protocol",
+            action="store",
+            dest="protocol",
+            choices=(
+                constants.Protocol.HTTP,
+                constants.Protocol.HTTPS,
+            ),
+            default=constants.Protocol.HTTP,
+            help="""Designates the Selenium Grid protocol to use.
+                    Default: http.""",
+        )
         parser.add_option(
             "--server",
             action="store",
@@ -532,6 +545,7 @@ def beforeTest(self, test):
         test.test.locale_code = self.options.locale_code
         test.test.interval = self.options.interval
         test.test.start_page = self.options.start_page
+        test.test.protocol = self.options.protocol
         test.test.servername = self.options.servername
         test.test.port = self.options.port
         test.test.user_data_dir = self.options.user_data_dir
diff --git a/setup.py b/setup.py
@@ -125,6 +125,7 @@
         "wheel>=0.36.2",
         "attrs>=21.2.0",
         'PyYAML>=5.4.1;python_version>="3.6"',
+        "sortedcontainers==2.4.0",
         "certifi>=2020.12.5",
         "six==1.16.0",
         "nose==1.3.7",
@@ -179,7 +180,7 @@
         'prompt-toolkit==1.0.18;python_version<"3.6"',
         'prompt-toolkit==3.0.18;python_version>="3.6"',
         'decorator==4.4.2;python_version<"3.5"',
-        'decorator==5.0.7;python_version>="3.5"',
+        'decorator==5.0.9;python_version>="3.5"',
         'ipython==5.10.0;python_version<"3.5"',
         'ipython==6.5.0;python_version>="3.5" and python_version<"3.6"',
         'ipython==7.16.1;python_version>="3.6" and python_version<"3.7"',
@@ -198,7 +199,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.2.0;python_version>="3.6" and python_version<"4.0"',
+        'rich==10.2.1;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"',
@@ -208,7 +209,7 @@
         # pip install -e .[coverage]
         "coverage": [
             "coverage==5.5",
-            "pytest-cov==2.11.1",
+            "pytest-cov==2.12.0",
         ],
         # pip install -e .[flake]
         "flake": [

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`padding: 8px;`
`22`	`22`	`}`
`23`	`23`	`</style>`
`24`		`-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.1/brython.js"></script>`
	`24`	`+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.2/brython.js"></script>`
`25`	`25`	`</head>`
`26`	`26`	`<body onload="brython()">`
`27`	`27`	`<table>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# seleniumbase package`
`2`		`-__version__ = "1.63.5"`
	`2`	`+__version__ = "1.63.6"`