squash: $defs - definitions

Author: karenetheridge

tests/draft4/future-keywords.json

@@ -326,7 +326,7 @@
         "description": "$recursiveRef without using nesting",
         "schema": {
             "$id": "http://localhost:4242",
-            "$defs": {
+            "definitions": {
                 "myobject": {
                     "$id": "myobject.json",
                     "$recursiveAnchor": true,
@@ -341,7 +341,7 @@
             },
             "anyOf": [
                 { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
+                { "$ref": "#/definitions/myobject" }
             ]
         },
         "tests": [
@@ -361,12 +361,12 @@
                 "valid": true
             },
             {
-                "description": "two levels, properties match with inner definition",
+                "description": "two levels, additionalProperties always matches",
                 "data": { "foo": { "bar": "hi" } },
                 "valid": true
             },
             {
-                "description": "two levels, no match",
+                "description": "two levels, additionalProperties always matches",
                 "data": { "foo": { "bar": 1 } },
                 "valid": true
             }
@@ -377,7 +377,7 @@
         "schema": {
             "$id": "http://localhost:4242",
             "$recursiveAnchor": true,
-            "$defs": {
+            "definitions": {
                 "myobject": {
                     "$id": "myobject.json",
                     "$recursiveAnchor": true,
@@ -392,7 +392,7 @@
             },
             "anyOf": [
                 { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
+                { "$ref": "#/definitions/myobject" }
             ]
         },
         "tests": [

tests/draft6/future-keywords.json

@@ -289,7 +289,7 @@
         "description": "$recursiveRef without using nesting",
         "schema": {
             "$id": "http://localhost:4242",
-            "$defs": {
+            "definitions": {
                 "myobject": {
                     "$id": "myobject.json",
                     "$recursiveAnchor": true,
@@ -304,7 +304,7 @@
             },
             "anyOf": [
                 { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
+                { "$ref": "#/definitions/myobject" }
             ]
         },
         "tests": [
@@ -340,7 +340,7 @@
         "schema": {
             "$id": "http://localhost:4242",
             "$recursiveAnchor": true,
-            "$defs": {
+            "definitions": {
                 "myobject": {
                     "$id": "myobject.json",
                     "$recursiveAnchor": true,
@@ -355,7 +355,7 @@
             },
             "anyOf": [
                 { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
+                { "$ref": "#/definitions/myobject" }
             ]
         },
         "tests": [

tests/draft7/future-keywords.json

@@ -257,7 +257,7 @@
         "description": "$recursiveRef without using nesting",
         "schema": {
             "$id": "http://localhost:4242",
-            "$defs": {
+            "definitions": {
                 "myobject": {
                     "$id": "myobject.json",
                     "$recursiveAnchor": true,
@@ -272,7 +272,7 @@
             },
             "anyOf": [
                 { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
+                { "$ref": "#/definitions/myobject" }
             ]
         },
         "tests": [
@@ -308,7 +308,7 @@
         "schema": {
             "$id": "http://localhost:4242",
             "$recursiveAnchor": true,
-            "$defs": {
+            "definitions": {
                 "myobject": {
                     "$id": "myobject.json",
                     "$recursiveAnchor": true,
@@ -323,7 +323,7 @@
             },
             "anyOf": [
                 { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
+                { "$ref": "#/definitions/myobject" }
             ]
         },
         "tests": [