Squashed 'json/' changes from 8c3d56d..8982b0b

Julian · Julian · commit d2eb79f489f2 · 2019-01-04T09:18:43.000Z
8982b0b Merge pull request #243 from gregsdennis/master 432eab6 added draft-03 version f55b4c2 Added test for additional properties looking in applicator keywords git-subtree-dir: json git-subtree-split: 8982b0ba6d721b09d91ebbf2414fdf443e4740b4
diff --git a/tests/draft3/additionalProperties.json b/tests/draft3/additionalProperties.json
@@ -113,5 +113,21 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties should not look in applicators",
+        "schema": {
+            "extends": [
+                {"properties": {"foo": {}}}
+            ],
+            "additionalProperties": {"type": "boolean"}
+        },
+        "tests": [
+            {
+                "description": "properties defined in extends are not allowed",
+                "data": {"foo": 1, "bar": true},
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft4/additionalProperties.json b/tests/draft4/additionalProperties.json
@@ -113,5 +113,21 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties should not look in applicators",
+        "schema": {
+            "allOf": [
+                {"properties": {"foo": {}}}
+            ],
+            "additionalProperties": {"type": "boolean"}
+        },
+        "tests": [
+            {
+                "description": "properties defined in allOf are not allowed",
+                "data": {"foo": 1, "bar": true},
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft6/additionalProperties.json b/tests/draft6/additionalProperties.json
@@ -113,5 +113,21 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties should not look in applicators",
+        "schema": {
+            "allOf": [
+                {"properties": {"foo": {}}}
+            ],
+            "additionalProperties": {"type": "boolean"}
+        },
+        "tests": [
+            {
+                "description": "properties defined in allOf are not allowed",
+                "data": {"foo": 1, "bar": true},
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft7/additionalProperties.json b/tests/draft7/additionalProperties.json
@@ -113,5 +113,21 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties should not look in applicators",
+        "schema": {
+            "allOf": [
+                {"properties": {"foo": {}}}
+            ],
+            "additionalProperties": {"type": "boolean"}
+        },
+        "tests": [
+            {
+                "description": "properties defined in allOf are not allowed",
+                "data": {"foo": 1, "bar": true},
+                "valid": false
+            }
+        ]
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,21 @@`
`113`	`113`	`"valid": true`
`114`	`114`	`}`
`115`	`115`	`]`
	`116`	`+ },`
	`117`	`+ {`
	`118`	`+ "description": "additionalProperties should not look in applicators",`
	`119`	`+ "schema": {`
	`120`	`+ "extends": [`
	`121`	`+ {"properties": {"foo": {}}}`
	`122`	`+ ],`
	`123`	`+ "additionalProperties": {"type": "boolean"}`
	`124`	`+ },`
	`125`	`+ "tests": [`
	`126`	`+ {`
	`127`	`+ "description": "properties defined in extends are not allowed",`
	`128`	`+ "data": {"foo": 1, "bar": true},`
	`129`	`+ "valid": false`
	`130`	`+ }`
	`131`	`+ ]`
`116`	`132`	`}`
`117`	`133`	`]`