Merge pull request #441 from scitran/schema-defs-additional-properties

Schema defs additional properties

raml/api.raml

@@ -7,7 +7,7 @@ traits:
     - validates-json-body:
         description: Validates incoming request body
         responses:
-            422:
+            400:
                 description: |
                     JSON did not validate against schema for this endpoint
 

raml/schemas/definitions/job.json

@@ -67,5 +67,6 @@
       "_id": {
         "type": "string"
       }
-    }
+    },
+    "additionalProperties": false
 }

raml/schemas/definitions/user-output.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$ref":"user.json#",
+  "additionalProperties":{
+    "created":{"type":"string"},
+    "modified":{"type":"string"}
+  },
+  "required":[
+     "_id", "firstname", "lastname",
+     "root", "email", "created", "modified"
+   ]
+}

raml/schemas/definitions/user.json

@@ -38,5 +38,6 @@
                           "type": "object"
                         }
     },
-    "type":"object"
+    "type":"object",
+    "additionalProperties": false
 }

raml/schemas/output/user-list.json

@@ -2,6 +2,6 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "array",
   "items": {
-    "$ref":"../definitions/user.json#"
+    "$ref":"../definitions/user-output.json#"
   }
 }

raml/schemas/output/user.json

 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "$ref":"../definitions/user.json#"
+  "$ref":"../definitions/user-output.json#"
 }

test/integration_tests/abao/abao_test_hooks.js

@@ -19,11 +19,6 @@ hooks.skip("POST /upload/label -> 402");
 hooks.skip("POST /upload/uid -> 402");
 hooks.skip("POST /upload/uid-match -> 402");
 
-// Should 422 for JSON not matching schema
-// After this is fixed, add "validates-json-body" trait
-// to all endpoints which validate a json body
-hooks.skip("POST /users -> 422");
-
 // Should 404
 hooks.skip("GET /jobs/{JobId} -> 404");
 
@@ -109,8 +104,8 @@ hooks.before("GET /download -> 404", function(test, done) {
     done();
 });
 
-hooks.before("POST /users -> 422", function(test, done) {
-    test.request.body = {totally:"not valid"};
+hooks.before("POST /users -> 400", function(test, done) {
+    test.request.body = {api_key:{key:"test"}};
     done();
 });