Skip to content

Commit

Permalink
Squashed 'json/' changes from 27f8c84..728066f
Browse files Browse the repository at this point in the history 
728066f Merge pull request #188 from json-schema-org/sequences-and-objects
c47341a Flesh out some more ignore cases for object validators.
f339360 make test descriptions unique and no longer than 60 chars
6820a83 Merge branch 'CroniD-master'
aaa32d8 test: update "json-pointer" format to exclude fragments
85a552f added some more tests for json-pointer format
b7b79fc extended tests for json-pointer format

git-subtree-dir: json
git-subtree-split: 728066f9c5c258ba3b1804a22a5b998f2ec77ec0
  • Loading branch information
@Julian
Julian committed Oct 29, 2017
1 parent 4149dd8 commit 678570a
Show file tree
Hide file tree
Showing 21 changed files with 337 additions and 34 deletions.
5 changes: 4 additions & 1 deletion json/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ runTest(4);
runTest(6);

function runTest(draft) {
var opts = {format: 'full'};
var opts = {
format: 'full',
formats: {'json-pointer': /^(?:\/(?:[^~\/]|~0|~1)*)*$/}
};
if (draft == 4) opts.meta = false;
var ajv = new Ajv(opts);
ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft3/additionalProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,20 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [1, 2, 3],
"valid": true
},
{
"description": "ignores strings",
"data": "foobarbaz",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
},
{
"description": "patternProperties are not additional properties",
"data": {"foo":1, "vroom": 2},
Expand Down
14 changes: 12 additions & 2 deletions json/tests/draft3/dependencies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,18 @@
"valid": false
},
{
"description": "ignores non-objects",
"data": "foo",
"description": "ignores arrays",
"data": ["bar"],
"valid": true
},
{
"description": "ignores strings",
"data": "foobar",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
Expand Down
7 changes: 6 additions & 1 deletion json/tests/draft3/patternProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
Expand Down
7 changes: 6 additions & 1 deletion json/tests/draft3/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,14 @@
"valid": true
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
},
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft4/additionalProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,20 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [1, 2, 3],
"valid": true
},
{
"description": "ignores strings",
"data": "foobarbaz",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
},
{
"description": "patternProperties are not additional properties",
"data": {"foo":1, "vroom": 2},
Expand Down
14 changes: 12 additions & 2 deletions json/tests/draft4/dependencies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,18 @@
"valid": false
},
{
"description": "ignores non-objects",
"data": "foo",
"description": "ignores arrays",
"data": ["bar"],
"valid": true
},
{
"description": "ignores strings",
"data": "foobar",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft4/maxProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,19 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [1, 2, 3],
"valid": true
},
{
"description": "ignores strings",
"data": "foobar",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
}
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft4/minProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,19 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores strings",
"data": "",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
}
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft4/patternProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,17 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores strings",
"data": "",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
Expand Down
7 changes: 6 additions & 1 deletion json/tests/draft4/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,14 @@
"valid": true
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
},
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft4/required.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores strings",
"data": "",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft6/additionalProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,20 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [1, 2, 3],
"valid": true
},
{
"description": "ignores strings",
"data": "foobarbaz",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
},
{
"description": "patternProperties are not additional properties",
"data": {"foo":1, "vroom": 2},
Expand Down
14 changes: 12 additions & 2 deletions json/tests/draft6/dependencies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,18 @@
"valid": false
},
{
"description": "ignores non-objects",
"data": "foo",
"description": "ignores arrays",
"data": ["bar"],
"valid": true
},
{
"description": "ignores strings",
"data": "foobar",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft6/maxProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,19 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [1, 2, 3],
"valid": true
},
{
"description": "ignores strings",
"data": "foobar",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
}
Expand Down
12 changes: 11 additions & 1 deletion json/tests/draft6/minProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,19 @@
"valid": false
},
{
"description": "ignores non-objects",
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores strings",
"data": "",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
}
Expand Down
Loading

0 comments on commit 678570a

Please sign in to comment.