From d2eb79f489f2647e2fc43fa341bb3ba7d307f4a6 Mon Sep 17 00:00:00 2001
From: Julian Berman <Julian@GrayVines.com>
Date: Fri, 4 Jan 2019 09:18:43 +0000
Subject: Squashed 'json/' changes from 8c3d56d..8982b0b

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
---
 tests/draft4/additionalProperties.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'tests/draft4')

diff --git a/tests/draft4/additionalProperties.json b/tests/draft4/additionalProperties.json
index d4b5d98..ffeac6b 100644
--- 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
+            }
+        ]
     }
 ]
-- 
cgit v1.2.1