vitalif-js
/
ajv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into beta

master
Evgeny Poberezkin 2017-12-02 13:12:55 +00:00
parent ce62f117ee 81b810f421
commit 42cfcf9c42
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -12,7 +12,7 @@
".tonic_example.js"
],
"scripts": {
"eslint": "if-node-version \">=4\" eslint lib/*.js lib/compile/*.js spec scripts",
"eslint": "if-node-version \">=4\" eslint lib/*.js lib/compile/*.js spec/*.js scripts",
"jshint": "jshint lib/*.js lib/**/*.js --exclude lib/dotjs/**/*",
"test-spec": "mocha spec/*.spec.js -R spec $(if-node-version 7 echo --harmony-async-await)",
"test-fast": "AJV_FAST_TEST=true npm run test-spec",

2
spec/JSON-Schema-Test-Suite

@ -1 +1 @@
Subproject commit 8758156cb3bae615e5e75abcab6e757883d10669
Subproject commit 870b9f7ebd35a238ba9d609424db51c7ca027d4a

15
spec/json-schema.spec.js
View File

@ -10,21 +10,30 @@ var remoteRefs = {
'http://localhost:1234/integer.json': require('./JSON-Schema-Test-Suite/remotes/integer.json'),
'http://localhost:1234/subSchemas.json': require('./JSON-Schema-Test-Suite/remotes/subSchemas.json'),
'http://localhost:1234/folder/folderInteger.json': require('./JSON-Schema-Test-Suite/remotes/folder/folderInteger.json'),
'http://localhost:1234/name.json': require('./JSON-Schema-Test-Suite/remotes/name.json')
};
runTest(getAjvInstances(options, {meta: false, schemaId: 'id'}), 4, typeof window == 'object'
? suite(require('./JSON-Schema-Test-Suite/tests/draft4/{**/,}*.json', {mode: 'list'}))
: './JSON-Schema-Test-Suite/tests/draft4/{**/,}*.json');
runTest(getAjvInstances(options, {schemaId: 'auto'}), 6, typeof window == 'object'
runTest(getAjvInstances(options, {meta: false, schemaId: 'auto', format: 'full'}), 6, typeof window == 'object'
? suite(require('./JSON-Schema-Test-Suite/tests/draft6/{**/,}*.json', {mode: 'list'}))
: './JSON-Schema-Test-Suite/tests/draft6/{**/,}*.json');
function runTest(instances, draft, tests) {
instances.forEach(function (ajv) {
ajv.addMetaSchema(require('../lib/refs/json-schema-draft-04.json'));
if (draft == 4) ajv._opts.defaultMeta = 'http://json-schema.org/draft-04/schema#';
switch (draft) {
case 4:
ajv.addMetaSchema(require('../lib/refs/json-schema-draft-04.json'));
ajv._opts.defaultMeta = 'http://json-schema.org/draft-04/schema#';
break;
case 6:
ajv.addMetaSchema(require('../lib/refs/json-schema-draft-06.json'));
ajv._opts.defaultMeta = 'http://json-schema.org/draft-06/schema#';
break;
}
for (var id in remoteRefs) ajv.addSchema(remoteRefs[id], id);
});