Merge pull request #583 from santhosh-tekuri/defs

Replace '$defs' with 'definitions' in drafts 6,7

Author: Julian

tests/draft6/id.json

@@ -52,7 +52,7 @@
     {
         "description": "non-schema object containing a plain-name $id property",
         "schema": {
-            "$defs": {
+            "definitions": {
                 "const_not_anchor": {
                     "const": {
                         "$id": "#not_a_real_anchor"
@@ -71,7 +71,7 @@
                             }
                         },
                         {
-                            "$ref": "#/$defs/const_not_anchor"
+                            "$ref": "#/definitions/const_not_anchor"
                         }
                     ]
                 }
@@ -93,7 +93,7 @@
     {
         "description": "non-schema object containing an $id property",
         "schema": {
-            "$defs": {
+            "definitions": {
                 "const_not_id": {
                     "const": {
                         "$id": "not_a_real_id"
@@ -112,7 +112,7 @@
                             }
                         },
                         {
-                            "$ref": "#/$defs/const_not_id"
+                            "$ref": "#/definitions/const_not_id"
                         }
                     ]
                 }

tests/draft6/ref.json

@@ -737,9 +737,9 @@
         "schema": {
             "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
             "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/$defs/bar"}
+                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/definitions/bar"}
             },
-            "$defs": {
+            "definitions": {
                 "bar": {"type": "string"}
             }
         },

tests/draft7/id.json

@@ -52,7 +52,7 @@
     {
         "description": "non-schema object containing a plain-name $id property",
         "schema": {
-            "$defs": {
+            "definitions": {
                 "const_not_anchor": {
                     "const": {
                         "$id": "#not_a_real_anchor"
@@ -64,7 +64,7 @@
             },
             "then": true,
             "else" : {
-                "$ref": "#/$defs/const_not_anchor"
+                "$ref": "#/definitions/const_not_anchor"
             }
         },
         "tests": [
@@ -83,7 +83,7 @@
     {
         "description": "non-schema object containing an $id property",
         "schema": {
-            "$defs": {
+            "definitions": {
                 "const_not_id": {
                     "const": {
                         "$id": "not_a_real_id"
@@ -95,7 +95,7 @@
             },
             "then": true,
             "else" : {
-                "$ref": "#/$defs/const_not_id"
+                "$ref": "#/definitions/const_not_id"
             }
         },
         "tests": [

tests/draft7/ref.json

@@ -773,9 +773,9 @@
         "schema": {
             "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
             "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/$defs/bar"}
+                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/definitions/bar"}
             },
-            "$defs": {
+            "definitions": {
                 "bar": {"type": "string"}
             }
         },