Merge pull request #71 from ElSnoMan/caps-in-cli

--caps CLI arg

conftest.py

@@ -116,6 +116,16 @@ def py_config(project_root, request) -> PyleniumConfig:
     if cli_browser_options:
         config.driver.options = [option.strip() for option in cli_browser_options.split(',')]
 
+    cli_browser = request.config.getoption('--browser')
+    if cli_browser:
+        config.driver.browser = cli_browser
+
+    cli_capabilities = request.config.getoption('--caps')
+    if cli_capabilities:
+        # --caps must be in '[{}, {}]' format
+        # with double quotes around each key and value
+        config.driver.capabilities = json.loads(cli_capabilities)
+
     # Logging Settings
     cli_pylog_level = request.config.getoption('--pylog_level')
     if cli_pylog_level:
@@ -126,10 +136,6 @@ def py_config(project_root, request) -> PyleniumConfig:
         shots_on = True if cli_screenshots_on.lower() == 'true' else False
         config.logging.screenshots_on = shots_on
 
-    cli_browser = request.config.getoption('--browser')
-    if cli_browser:
-        config.driver.browser = cli_browser
-
     return config
 
 
@@ -203,3 +209,7 @@ def pytest_addoption(parser):
         '--options', action='store',
         default='', help='Comma-separated list of Browser Options. Ex. "headless, incognito"'
     )
+    parser.addoption(
+        '--caps', action='store',
+        default='', help='List of key-value pairs. Ex. "[{}, {}]"'
+    )

pylenium/config.py

@@ -12,7 +12,7 @@ class DriverConfig(BaseModel):
     remote_url: str = ''
     wait_time: int = 10
     options: List[str] = []
-    capabilities: List[dict] = [{}]
+    capabilities: List[dict] = []
     version: str = 'latest'
 
 
@@ -34,6 +34,7 @@ class PyleniumConfig(BaseModel):
     viewport: ViewportConfig = ViewportConfig()
     custom: dict = {}
 
+
 # MODELS #
 ##########
 

pylenium/webdriver_factory.py

@@ -166,7 +166,7 @@ def build_remote(browser: str, remote_url: str, browser_options: List[str], capa
     elif browser == 'edge':
         caps = webdriver.DesiredCapabilities.EDGE.copy()
     else:
-        caps = None
+        caps = {}
 
     if capabilities:
         caps = capabilities

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='pyleniumio',
-    version='1.5.0',
+    version='1.5.1',
     packages=[
         'pylenium'
     ],