Add support for https protocol for Remote drivers (#272)

* Add support for https protocol for Remote drivers

* Update pre-commit black version

Author: platonoff-dev

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
         args: [--safe, --quiet]

src/pytest_selenium/drivers/appium.py

@@ -9,6 +9,8 @@
 
 
 def driver_kwargs(capabilities, host, port, **kwargs):
-    executor = "http://{0}:{1}/wd/hub".format(host, port)
+    host = host if host.startswith("http") else f"http://{host}"
+    executor = f"{host}:{port}/wd/hub"
+
     kwargs = {"command_executor": executor, "desired_capabilities": capabilities}
     return kwargs

src/pytest_selenium/drivers/remote.py

@@ -9,7 +9,8 @@
 
 
 def driver_kwargs(capabilities, host, port, **kwargs):
-    executor = "http://{0}:{1}/wd/hub".format(host, port)
+    host = host if host.startswith("http") else f"http://{host}"
+    executor = f"{host}:{port}/wd/hub"
 
     kwargs = {
         "command_executor": executor,

testing/test_driver.py

@@ -107,6 +107,37 @@ def test_pass(driver_kwargs):
     testdir.quick_qa("--driver", "Remote", file_test, passed=1)
 
 
+@pytest.mark.parametrize(
+    ("host", "expected"),
+    [
+        ("https://some.host.com", "https://some.host.com"),
+        ("http://some.host.com", "http://some.host.com"),
+        ("some.host.com", "http://some.host.com"),
+    ],
+)
+def test_host_protocol(host, expected, testdir):
+    filetest = testdir.makepyfile(
+        """
+        import pytest
+        @pytest.mark.nondestructive
+        def test_pass(driver_kwargs):
+            assert driver_kwargs['command_executor'] == '{}:4444/wd/hub'
+        """.format(
+            expected
+        )
+    )
+    testdir.quick_qa(
+        "--driver",
+        "Remote",
+        "--selenium-host",
+        host,
+        "--selenium-port",
+        "4444",
+        filetest,
+        passed=1,
+    )
+
+
 @pytest.mark.parametrize(
     ("host_arg_name", "port_arg_name", "context"),
     [