diff --git a/package.json b/package.json index 7e9dfa2..4d83149 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/spec/JSON-Schema-Test-Suite b/spec/JSON-Schema-Test-Suite index 8758156..870b9f7 160000 --- a/spec/JSON-Schema-Test-Suite +++ b/spec/JSON-Schema-Test-Suite @@ -1 +1 @@ -Subproject commit 8758156cb3bae615e5e75abcab6e757883d10669 +Subproject commit 870b9f7ebd35a238ba9d609424db51c7ca027d4a diff --git a/spec/json-schema.spec.js b/spec/json-schema.spec.js index bde31a2..e6262bf 100644 --- a/spec/json-schema.spec.js +++ b/spec/json-schema.spec.js @@ -10,13 +10,19 @@ 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}), 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), 6, typeof window == 'object' +runTest(getAjvInstances(options, { + format: 'full', + formats: { + 'json-pointer': /^(?:\/(?:[^~/]|~0|~1)*)*$/ + } +}), 6, typeof window == 'object' ? suite(require('./JSON-Schema-Test-Suite/tests/draft6/{**/,}*.json', {mode: 'list'})) : './JSON-Schema-Test-Suite/tests/draft6/{**/,}*.json');