diff options
| author | Julian Berman <Julian@GrayVines.com> | 2022-08-06 22:06:33 +0300 |
|---|---|---|
| committer | Julian Berman <Julian@GrayVines.com> | 2022-08-06 22:06:33 +0300 |
| commit | 9e7387d89098b43062b9cbab177cd15aad965f6a (patch) | |
| tree | c13904be155802f4edfbd54b95f1fdc393e78dd9 | |
| parent | b9ff8c481f054bff83dad4c5b4da0efc221175f2 (diff) | |
| download | jsonschema-9e7387d89098b43062b9cbab177cd15aad965f6a.tar.gz | |
Squashed 'json/' changes from 91ecacf60..0015d5242
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
| -rw-r--r-- | tests/draft6/id.json | 8 | ||||
| -rw-r--r-- | tests/draft6/ref.json | 6 | ||||
| -rw-r--r-- | tests/draft7/id.json | 8 | ||||
| -rw-r--r-- | tests/draft7/ref.json | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/tests/draft6/id.json b/tests/draft6/id.json index 0cbff5a..03d30fc 100644 --- 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 index 3e72a59..1724f81 100644 --- 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 index b03248b..6be81b8 100644 --- 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 index dbf0595..ab67f0e 100644 --- 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" |