wip

software/jstestnode/instance-jstestnode-input-schema.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Parameters to instantiate JSTestNode",
   "additionalProperties": true,
-  "common": {
+  "properties": {
     "test-suite": {
       "description": "The test suite to run",
       "type": "string",
@@ -17,100 +17,84 @@
       "format": "uri",
       "default": "(the web server started by this instance)",
       "example": "https://softinst1234.host.vifib.net/"
-    }
-  },
-  "oneOf": [
-    {
-      "description": "Configuration for Selenium server",
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "desired-capabilities",
-        "server-url",
-        "target"
-      ],
-      "properties": {
-        "target": {
-          "description": "Target system",
-          "type": "string",
-          "const": "selenium-server"
-        },
-        "test-suite": {
-          "$ref": "#/common/test-suite"
-        },
-        "remote-access-url": {
-          "$ref": "#/common/remote-access-url"
-        },
-        "server-url": {
-          "description": "URL of the selenium server",
-          "type": "string",
-          "format": "uri"
-        },
-        "verify-server-certificate": {
-          "description": "Verify the SSL/TLS Certificats of the selenium server when using HTTPS",
-          "type": "boolean",
-          "default": true
-        },
-        "server-ca-certificate": {
-          "description": "PEM encoded bundle of CA Certificates to verify the SSL/TLS Certificate of the selenium server when using HTTPS",
-          "type": "string",
-          "default": "root certificates from http://certifi.io/en/latest/"
-        },
-        "desired-capabilities": {
-          "description": "Desired browser capabilities",
+    },
+    "test-runner": {
+      "oneOf": [
+        {
+          "type": "object",
+          "description": "Configuration for Selenium server",
+          "additionalProperties": false,
           "required": [
-            "browserName"
+            "desired-capabilities",
+            "server-url",
+            "target"
           ],
-          "type": "object",
           "properties": {
-            "browserName": {
-              "description": "Name of the browser being used, for example firefox, chrome",
-              "type": "string"
+            "target": {
+              "description": "Target system",
+              "type": "string",
+              "const": "selenium-server"
             },
-            "version": {
-              "description": "The browser version",
-              "type": "string"
+            "server-url": {
+              "description": "URL of the selenium server",
+              "type": "string",
+              "format": "uri"
+            },
+            "verify-server-certificate": {
+              "description": "Verify the SSL/TLS Certificats of the selenium server when using HTTPS",
+              "type": "boolean",
+              "default": true
+            },
+            "server-ca-certificate": {
+              "description": "PEM encoded bundle of CA Certificates to verify the SSL/TLS Certificate of the selenium server when using HTTPS",
+              "type": "string",
+              "default": "root certificates from http://certifi.io/en/latest/"
+            },
+            "desired-capabilities": {
+              "description": "Desired browser capabilities",
+              "required": [
+                "browserName"
+              ],
+              "type": "object",
+              "properties": {
+                "browserName": {
+                  "description": "Name of the browser being used, for example firefox, chrome",
+                  "type": "string"
+                },
+                "version": {
+                  "description": "The browser version",
+                  "type": "string"
+                }
+              }
             }
           }
-        }
-      }
-    },
-    {
-      "description": "Configuration for Firefox",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "target": {
-          "description": "Target system",
-          "const": "firefox",
-          "type": "string",
-          "default": "firefox"
-        },
-        "test-suite": {
-          "$ref": "#/common/test-suite"
-        },
-        "remote-access-url": {
-          "$ref": "#/common/remote-access-url"
-        }
-      }
-    },
-    {
-      "description": "Configuration for NodeJS",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "target": {
-          "description": "Target system",
-          "const": "node",
-          "type": "string"
         },
-        "test-suite": {
-          "$ref": "#/common/test-suite"
+        {
+          "type": "object",
+          "description": "Configuration for Firefox",
+          "additionalProperties": false,
+          "properties": {
+            "target": {
+              "description": "Target system",
+              "const": "firefox",
+              "type": "string",
+              "default": "firefox"
+            }
+          }
         },
-        "remote-access-url": {
-          "$ref": "#/common/remote-access-url"
+        {
+          "type": "object",
+          "description": "Configuration for NodeJS",
+          "additionalProperties": false,
+          "properties": {
+            "target": {
+              "description": "Target system",
+              "const": "node",
+              "type": "string"
+            }
+          }
         }
-      }
+      ]
     }
-  ]
+  }
 }