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,12 +17,12 @@
       "format": "uri",
       "default": "(the web server started by this instance)",
       "example": "https://softinst1234.host.vifib.net/"
-    }
     },
+    "test-runner": {
       "oneOf": [
         {
-      "description": "Configuration for Selenium server",
           "type": "object",
+          "description": "Configuration for Selenium server",
           "additionalProperties": false,
           "required": [
             "desired-capabilities",
@@ -35,12 +35,6 @@
               "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",
@@ -76,8 +70,8 @@
           }
         },
         {
-      "description": "Configuration for Firefox",
           "type": "object",
+          "description": "Configuration for Firefox",
           "additionalProperties": false,
           "properties": {
             "target": {
@@ -85,32 +79,22 @@
               "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",
+          "description": "Configuration for NodeJS",
           "additionalProperties": false,
           "properties": {
             "target": {
               "description": "Target system",
               "const": "node",
               "type": "string"
-        },
-        "test-suite": {
-          "$ref": "#/common/test-suite"
-        },
-        "remote-access-url": {
-          "$ref": "#/common/remote-access-url"
             }
           }
         }
       ]
+    }
+  }
 }