reorganize capabilities

Davide Moro · Davide Moro · commit 7f6d2f9d6bb6 · 2017-09-07T14:32:37.000+02:00
diff --git a/{{cookiecutter.project_slug}}/Dockerfile b/{{cookiecutter.project_slug}}/Dockerfile
@@ -7,4 +7,4 @@ RUN pip3 install --upgrade pip \
         tox
 
 ENTRYPOINT [ "tox"]
-CMD ["-epy36",  "--", "-vvv", "--splinter-webdriver=remote", "--variables=credentials_template.yml", "--splinter-remote-url=http://{{cookiecutter.browserstack_username}}:{{cookiecutter.browserstack_access_key}}@hub.browserstack.com:80/wd/hub", "--variables=capabilities/WIN10-FIREFOX53.json"]
+CMD ["-epy36",  "--", "-vvv", "--splinter-webdriver=remote", "--variables=credentials_template.yml", "--splinter-remote-url=http://{{cookiecutter.browserstack_username}}:{{cookiecutter.browserstack_access_key}}@hub.browserstack.com:80/wd/hub", "--variables capabilities/os/WIN10.json", "--variables capabilities/browsers/chrome/CHROME59.json", "--variables capabilities/resolutions/1280x1024.json"]
diff --git a/{{cookiecutter.project_slug}}/capabilities/WIN10-CHROME59.json b/{{cookiecutter.project_slug}}/capabilities/WIN10-CHROME59.json
diff --git a/{{cookiecutter.project_slug}}/capabilities/WIN10-EDGE15.json b/{{cookiecutter.project_slug}}/capabilities/WIN10-EDGE15.json
diff --git a/{{cookiecutter.project_slug}}/capabilities/WIN10-FIREFOX53.json b/{{cookiecutter.project_slug}}/capabilities/WIN10-FIREFOX53.json
diff --git a/{{cookiecutter.project_slug}}/capabilities/WIN10-IE11.json b/{{cookiecutter.project_slug}}/capabilities/WIN10-IE11.json
diff --git a/{{cookiecutter.project_slug}}/capabilities/browsers/chrome/CHROME.json b/{{cookiecutter.project_slug}}/capabilities/browsers/chrome/CHROME.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "browser": "Chrome"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/browsers/chrome/CHROME59.json b/{{cookiecutter.project_slug}}/capabilities/browsers/chrome/CHROME59.json
@@ -0,0 +1,6 @@
+{
+    "capabilities": {
+        "browser": "Chrome",
+        "browser_version": "59.0"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/browsers/edge/EDGE.json b/{{cookiecutter.project_slug}}/capabilities/browsers/edge/EDGE.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "browser": "Edge"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/browsers/firefox/FIREFOX.json b/{{cookiecutter.project_slug}}/capabilities/browsers/firefox/FIREFOX.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "browser": "Firefox"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/browsers/firefox/FIREFOX53.json b/{{cookiecutter.project_slug}}/capabilities/browsers/firefox/FIREFOX53.json
@@ -0,0 +1,6 @@
+{
+    "capabilities": {
+        "browser": "Firefox",
+        "browser_version": "53.0"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/browsers/ie/IE.json b/{{cookiecutter.project_slug}}/capabilities/browsers/ie/IE.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "browser": "INTERNETEXPLORER"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/debug.json b/{{cookiecutter.project_slug}}/capabilities/debug.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "browserstack.debug": true
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/os/WIN10.json b/{{cookiecutter.project_slug}}/capabilities/os/WIN10.json
@@ -0,0 +1,6 @@
+{
+    "capabilities": {
+        "os": "Windows",
+        "os_version": "10"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/project.json b/{{cookiecutter.project_slug}}/capabilities/project.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "project": "{{cookiecutter.project_slug}}"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/capabilities/resolutions/1280x1024.json b/{{cookiecutter.project_slug}}/capabilities/resolutions/1280x1024.json
@@ -0,0 +1,5 @@
+{
+    "capabilities": {
+        "resolution": "1280x1024"
+    }
+}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/tests/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/tests/conftest.py
@@ -111,7 +111,5 @@ def splinter_driver_kwargs(splinter_webdriver, variables):
     """Webdriver kwargs."""
     capabilities = {}
     if splinter_webdriver == 'remote':
-        {{cookiecutter.project_slug}}_settings = variables.get('{{cookiecutter.project_slug}}', {})
-        capabilities = {{cookiecutter.project_slug}}_settings and {{cookiecutter.project_slug}}_settings.get(
-            'capabilities', {}) or {}
+        capabilities = variables.get('capabilities', {})
     return capabilities

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "capabilities": {
 +        "browser": "Chrome"
 +    }
 +}