Squashed 'json/' changes from 91ecacf60..0015d5242

Julian · Julian · commit 9e7387d89098 · 2022-08-06T22:06:33.000+03:00
0015d5242 Merge pull request #583 from santhosh-tekuri/defs e14c68bb4 Replace '$defs' with 'definitions' in drafts 6,7 c4341bd0a Merge pull request #582 from santhosh-tekuri/defs 4ae2c9b93 Replace '$defs' with 'definitions' in draft 6,7 git-subtree-dir: json git-subtree-split: 0015d5242d146248cb47850a08012b4829462d3b
diff --git a/tests/draft6/id.json b/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"
                         }
                     ]
                 }
diff --git a/tests/draft6/ref.json b/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"}
             }
         },
@@ -763,7 +763,7 @@
             "properties": {
                 "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
             },
-            "$defs": {
+            "definitions": {
                 "bar": {
                     "$id": "#something",
                     "type": "string"
diff --git a/tests/draft7/id.json b/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": [
diff --git a/tests/draft7/ref.json b/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"}
             }
         },
@@ -799,7 +799,7 @@
             "properties": {
                 "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
             },
-            "$defs": {
+            "definitions": {
                 "bar": {
                     "$id": "#something",
                     "type": "string"

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`{`
`53`	`53`	`"description": "non-schema object containing a plain-name $id property",`
`54`	`54`	`"schema": {`
`55`		`- "$defs": {`
	`55`	`+ "definitions": {`
`56`	`56`	`"const_not_anchor": {`
`57`	`57`	`"const": {`
`58`	`58`	`"$id": "#not_a_real_anchor"`
`@@ -71,7 +71,7 @@`
`71`	`71`	`}`
`72`	`72`	`},`
`73`	`73`	`{`
`74`		`- "$ref": "#/$defs/const_not_anchor"`
	`74`	`+ "$ref": "#/definitions/const_not_anchor"`
`75`	`75`	`}`
`76`	`76`	`]`
`77`	`77`	`}`
`@@ -93,7 +93,7 @@`
`93`	`93`	`{`
`94`	`94`	`"description": "non-schema object containing an $id property",`
`95`	`95`	`"schema": {`
`96`		`- "$defs": {`
	`96`	`+ "definitions": {`
`97`	`97`	`"const_not_id": {`
`98`	`98`	`"const": {`
`99`	`99`	`"$id": "not_a_real_id"`
`@@ -112,7 +112,7 @@`
`112`	`112`	`}`
`113`	`113`	`},`
`114`	`114`	`{`
`115`		`- "$ref": "#/$defs/const_not_id"`
	`115`	`+ "$ref": "#/definitions/const_not_id"`
`116`	`116`	`}`
`117`	`117`	`]`
`118`	`118`	`}`