Skip to content

Commit

Permalink
refactor: disable keywords moved from ajv
Browse files Browse the repository at this point in the history
  • Loading branch information
epoberezkin committed Dec 22, 2016
1 parent 145f58c commit f09fdb7
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 19 deletions.
10 changes: 5 additions & 5 deletions keywords/index.js
Expand Up @@ -6,9 +6,9 @@ module.exports = {
range: require('./range'),
regexp: require('./regexp'),
'typeof': require('./typeof'),
dynamicDefaults: require('./dynamicDefaults'),
formatMinimum: require('./formatMinimum'),
formatMaximum: require('./formatMaximum'),
patternRequired: require('./patternRequired'),
'switch': require('./switch')
dynamicDefaults: require('./dynamicDefaults')
// formatMinimum: require('./formatMinimum'),
// formatMaximum: require('./formatMaximum'),
// patternRequired: require('./patternRequired'),
// 'switch': require('./switch')
};
6 changes: 3 additions & 3 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "ajv-keywords",
"version": "1.2.0",
"version": "1.2.1",
"description": "Custom JSON-Schema keywords for ajv validator",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,10 +31,10 @@
},
"homepage": "https://github.com/epoberezkin/ajv-keywords#readme",
"peerDependencies": {
"ajv": ">=4.9.0"
"ajv": ">=4.10.0"
},
"devDependencies": {
"ajv": "^4.9.0",
"ajv": "^4.10.0",
"ajv-pack": "^0.2.0",
"chai": "^3.5.0",
"coveralls": "^2.11.9",
Expand Down
3 changes: 2 additions & 1 deletion spec/async-tests.spec.js
Expand Up @@ -5,13 +5,14 @@ var jsonSchemaTest = require('json-schema-test');
var defineKeywords = require('..');

var ajvs = [
defineKeywords(getAjv(), 'switch'),
// defineKeywords(getAjv(), 'switch'),
defineKeywords(getAjv()),
defineKeywords(getAjv(true))
];


jsonSchemaTest(ajvs, {
skip: true,
description: 'keywords "switch" with async schemas',
suites: {
'tests': './async-tests/{**/,}*.json'
Expand Down
8 changes: 4 additions & 4 deletions spec/formatLimit.spec.js
@@ -1,12 +1,12 @@
'use strict';

var Ajv = require('ajv');
var defFunc = require('../keywords/formatMaximum');
// var defFunc = require('../keywords/formatMaximum');
var defineKeywords = require('..');
var should = require('chai').should();


describe('keywords "formatMinimum" and "formatMaximum"', function() {
describe.skip('keywords "formatMinimum" and "formatMaximum"', function() {
var ajvs = getAjvs();
var ajvsFF = getAjvs(false);

Expand All @@ -31,8 +31,8 @@ describe('keywords "formatMinimum" and "formatMaximum"', function() {

function getAjvs(format) {
return [
defFunc(getAjv(format)),
defineKeywords(getAjv(format), 'formatMaximum'),
// defFunc(getAjv(format)),
// defineKeywords(getAjv(format), 'formatMaximum'),
defineKeywords(getAjv(format))
];
}
Expand Down
8 changes: 4 additions & 4 deletions spec/patternRequired.spec.js
@@ -1,12 +1,12 @@
'use strict';

var Ajv = require('ajv');
var defFunc = require('../keywords/patternRequired');
// var defFunc = require('../keywords/patternRequired');
var defineKeywords = require('..');
var should = require('chai').should();


describe('keywords "patternRequired"', function() {
describe.skip('keywords "patternRequired"', function() {
var ajvs = getAjvs();
var ajvsOP = getAjvs(true);

Expand All @@ -32,8 +32,8 @@ describe('keywords "patternRequired"', function() {

function getAjvs(ownProperties) {
return [
defFunc(getAjv(ownProperties)),
defineKeywords(getAjv(ownProperties), 'patternRequired'),
// defFunc(getAjv(ownProperties)),
// defineKeywords(getAjv(ownProperties), 'patternRequired'),
defineKeywords(getAjv(ownProperties))
];
}
Expand Down
5 changes: 3 additions & 2 deletions spec/schema-tests.spec.js
Expand Up @@ -5,14 +5,15 @@ var jsonSchemaTest = require('json-schema-test');
var defineKeywords = require('..');

var ajvs = [
defineKeywords(getAjv(),
['switch', 'patternRequired', 'formatMinimum', 'formatMaximum']),
// defineKeywords(getAjv(),
// ['switch', 'patternRequired', 'formatMinimum', 'formatMaximum']),
defineKeywords(getAjv()),
defineKeywords(getAjv(true))
];


jsonSchemaTest(ajvs, {
skip: true,
description: 'keywords "switch", "patternRequired", "formatMinimum", "formatMaximum"',
suites: {
'tests': './tests/{**/,}*.json'
Expand Down

0 comments on commit f09fdb7

Please sign in to comment.