Skip to content

Commit 65e3480

Browse files
committed
1 parent e68ff51 commit 65e3480

File tree

4 files changed

+27
-39
lines changed

4 files changed

+27
-39
lines changed

tests/draft2019-06/definitions.json tests/draft2019-06/defs.json

+2-10
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
"tests": [
66
{
77
"description": "valid definition schema",
8-
"data": {
9-
"definitions": {
10-
"foo": {"type": "integer"}
11-
}
12-
},
8+
"data": {"$defs": {"foo": {"type": "integer"}}},
139
"valid": true
1410
}
1511
]
@@ -20,11 +16,7 @@
2016
"tests": [
2117
{
2218
"description": "invalid definition schema",
23-
"data": {
24-
"definitions": {
25-
"foo": {"type": 1}
26-
}
27-
},
19+
"data": {"$defs": {"foo": {"type": 1}}},
2820
"valid": false
2921
}
3022
]

tests/draft2019-06/items.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@
133133
{
134134
"description": "items and subitems",
135135
"schema": {
136-
"definitions": {
136+
"$defs": {
137137
"item": {
138138
"type": "array",
139139
"additionalItems": false,
140140
"items": [
141-
{ "$ref": "#/definitions/sub-item" },
142-
{ "$ref": "#/definitions/sub-item" }
141+
{ "$ref": "#/$defs/sub-item" },
142+
{ "$ref": "#/$defs/sub-item" }
143143
]
144144
},
145145
"sub-item": {
@@ -150,9 +150,9 @@
150150
"type": "array",
151151
"additionalItems": false,
152152
"items": [
153-
{ "$ref": "#/definitions/item" },
154-
{ "$ref": "#/definitions/item" },
155-
{ "$ref": "#/definitions/item" }
153+
{ "$ref": "#/$defs/item" },
154+
{ "$ref": "#/$defs/item" },
155+
{ "$ref": "#/$defs/item" }
156156
]
157157
},
158158
"tests": [

tests/draft2019-06/ref.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@
120120
{
121121
"description": "nested refs",
122122
"schema": {
123-
"definitions": {
123+
"$defs": {
124124
"a": {"type": "integer"},
125-
"b": {"$ref": "#/definitions/a"},
126-
"c": {"$ref": "#/definitions/b"}
125+
"b": {"$ref": "#/$defs/a"},
126+
"c": {"$ref": "#/$defs/b"}
127127
},
128-
"$ref": "#/definitions/c"
128+
"$ref": "#/$defs/c"
129129
},
130130
"tests": [
131131
{
@@ -143,14 +143,14 @@
143143
{
144144
"description": "ref overrides any sibling keywords",
145145
"schema": {
146-
"definitions": {
146+
"$defs": {
147147
"reffed": {
148148
"type": "array"
149149
}
150150
},
151151
"properties": {
152152
"foo": {
153-
"$ref": "#/definitions/reffed",
153+
"$ref": "#/$defs/reffed",
154154
"maxItems": 2
155155
}
156156
}
@@ -212,8 +212,8 @@
212212
{
213213
"description": "$ref to boolean schema true",
214214
"schema": {
215-
"$ref": "#/definitions/bool",
216-
"definitions": {
215+
"$ref": "#/$defs/bool",
216+
"$defs": {
217217
"bool": true
218218
}
219219
},
@@ -228,8 +228,8 @@
228228
{
229229
"description": "$ref to boolean schema false",
230230
"schema": {
231-
"$ref": "#/definitions/bool",
232-
"definitions": {
231+
"$ref": "#/$defs/bool",
232+
"$defs": {
233233
"bool": false
234234
}
235235
},
@@ -255,7 +255,7 @@
255255
}
256256
},
257257
"required": ["meta", "nodes"],
258-
"definitions": {
258+
"$defs": {
259259
"node": {
260260
"$id": "http://localhost:1234/node",
261261
"description": "node",
@@ -333,9 +333,9 @@
333333
"description": "refs with quote",
334334
"schema": {
335335
"properties": {
336-
"foo\"bar": {"$ref": "#/definitions/foo%22bar"}
336+
"foo\"bar": {"$ref": "#/$defs/foo%22bar"}
337337
},
338-
"definitions": {
338+
"$defs": {
339339
"foo\"bar": {"type": "number"}
340340
}
341341
},

tests/draft2019-06/refRemote.json

+6-10
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@
7676
"schema": {
7777
"$id": "http://localhost:1234/scope_change_defs1.json",
7878
"type" : "object",
79-
"properties": {
80-
"list": {"$ref": "#/definitions/baz"}
81-
},
82-
"definitions": {
79+
"properties": {"list": {"$ref": "#/$defs/baz"}},
80+
"$defs": {
8381
"baz": {
8482
"$id": "folder/",
8583
"type": "array",
@@ -105,13 +103,11 @@
105103
"schema": {
106104
"$id": "http://localhost:1234/scope_change_defs2.json",
107105
"type" : "object",
108-
"properties": {
109-
"list": {"$ref": "#/definitions/baz/definitions/bar"}
110-
},
111-
"definitions": {
106+
"properties": {"list": {"$ref": "#/$defs/baz/$defs/bar"}},
107+
"$defs": {
112108
"baz": {
113109
"$id": "folder/",
114-
"definitions": {
110+
"$defs": {
115111
"bar": {
116112
"type": "array",
117113
"items": {"$ref": "folderInteger.json"}
@@ -139,7 +135,7 @@
139135
"$id": "http://localhost:1234/object",
140136
"type": "object",
141137
"properties": {
142-
"name": {"$ref": "name.json#/definitions/orNull"}
138+
"name": {"$ref": "name.json#/$defs/orNull"}
143139
}
144140
},
145141
"tests": [

0 commit comments

Comments
 (0)