Skip to content

Commit

Permalink
style fixes, closes #81
Browse files Browse the repository at this point in the history
  • Loading branch information
@epoberezkin
epoberezkin committed Feb 9, 2019
1 parent 4bc66b4 commit 4449d17
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 52 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.yml
View file
@@ -1,5 +1,7 @@
env:
node: true
mocha: true
es6: true
extends: 'eslint:recommended'
globals:
Promise: false
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Expand Up @@ -7,7 +7,7 @@
"build": "node node_modules/ajv/scripts/compile-dots.js node_modules/ajv/lib keywords",
"prepublish": "npm run build",
"test": "npm run build && npm run eslint && npm run test-cov",
"eslint": "eslint index.js keywords/*.js",
"eslint": "eslint index.js keywords/*.js spec",
"test-spec": "mocha spec/*.spec.js -R spec",
"test-cov": "istanbul cover -x 'spec/**' node_modules/mocha/bin/_mocha -- spec/*.spec.js -R spec"
},
Expand All @@ -34,18 +34,18 @@
"ajv": "^6.0.0"
},
"devDependencies": {
"ajv": "^6.0.0",
"ajv": "^6.8.1",
"ajv-pack": "^0.3.0",
"chai": "^4.0.2",
"coveralls": "^3.0.0",
"chai": "^4.2.0",
"coveralls": "^3.0.2",
"dot": "^1.1.1",
"eslint": "^5.0.0",
"glob": "^7.1.1",
"glob": "^7.1.3",
"istanbul": "^0.4.3",
"js-beautify": "^1.7.4",
"js-beautify": "^1.8.9",
"json-schema-test": "^2.0.0",
"mocha": "^5.0.0",
"mocha": "^5.2.0",
"pre-commit": "^1.1.3",
"uuid": "^3.0.1"
"uuid": "^3.3.2"
}
}
42 changes: 21 additions & 21 deletions spec/dynamicDefaults.spec.js
View file
Expand Up @@ -55,32 +55,32 @@ describe('keyword "dynamicDefaults"', function() {
done();
}, 1000);

function test(data) {
data.ts .should.be.a('number');
assert(data.ts <= Date.now());
function test(_data) {
_data.ts .should.be.a('number');
assert(_data.ts <= Date.now());

ajv.validate({type: 'string', format: 'date-time'}, data.dt) .should.equal(true);
new Date(data.dt) .should.be.a('Date');
ajv.validate({type: 'string', format: 'date-time'}, _data.dt) .should.equal(true);
new Date(_data.dt) .should.be.a('Date');

ajv.validate({type: 'string', format: 'date'}, data.d) .should.equal(true);
(new Date).toISOString().indexOf(data.d) .should.equal(0);
ajv.validate({type: 'string', format: 'date'}, _data.d) .should.equal(true);
(new Date).toISOString().indexOf(_data.d) .should.equal(0);

ajv.validate({type: 'string', format: 'time'}, data.t) .should.equal(true);
ajv.validate({type: 'string', format: 'time'}, _data.t) .should.equal(true);

data.r .should.be.a('number');
assert(data.r < 1);
assert(data.r >= 0);
_data.r .should.be.a('number');
assert(_data.r < 1);
assert(_data.r >= 0);

assert(data.ri === 0 || data.ri === 1);
assert(_data.ri === 0 || _data.ri === 1);

data.riN .should.be.a('number');
assert.equal(Math.floor(data.riN), data.riN);
assert(data.riN < 1000000);
assert(data.riN >= 0);
_data.riN .should.be.a('number');
assert.equal(Math.floor(_data.riN), _data.riN);
assert(_data.riN < 1000000);
assert(_data.riN >= 0);

data.s .should.be.a('number');
_data.s .should.be.a('number');

data.sN .should.be.a('number');
_data.sN .should.be.a('number');
}
});

Expand Down Expand Up @@ -152,9 +152,9 @@ describe('keyword "dynamicDefaults"', function() {
test(data1);
assert.notEqual(data.id, data1.id);

function test(data) {
ajv.validate(schema, data) .should.equal(true);
ajv.validate({ format: 'uuid', type: 'string' }, data.id) .should.equal(true);
function test(_data) {
ajv.validate(schema, _data) .should.equal(true);
ajv.validate({ format: 'uuid', type: 'string' }, _data.id) .should.equal(true);

delete defFunc.definition.DEFAULTS.uuid;
ajv.removeSchema();
Expand Down
2 changes: 1 addition & 1 deletion spec/formatLimit.spec.js
View file
Expand Up @@ -3,7 +3,7 @@
var Ajv = require('ajv');
var defFunc = require('../keywords/formatMaximum');
var defineKeywords = require('..');
var should = require('chai').should();
require('chai').should();


describe('keywords "formatMinimum" and "formatMaximum"', function() {
Expand Down
2 changes: 1 addition & 1 deletion spec/patternRequired.spec.js
View file
Expand Up @@ -3,7 +3,7 @@
var Ajv = require('ajv');
var defFunc = require('../keywords/patternRequired');
var defineKeywords = require('..');
var should = require('chai').should();
require('chai').should();


describe('keywords "patternRequired"', function() {
Expand Down
2 changes: 1 addition & 1 deletion spec/select.spec.js
View file
Expand Up @@ -19,7 +19,7 @@ describe('keyword "select"', function() {
var validate = ajv.compile({
select: { $data: '0/type' }
});

should.throw(function() {
validate({type: 'foo'});
});
Expand Down
39 changes: 19 additions & 20 deletions spec/transform.spec.js
View file
@@ -1,22 +1,21 @@
'use strict'
'use strict';

var Ajv = require('ajv')
var ajvPack = require('ajv-pack')
var defFunc = require('../keywords/transform')
var defineKeywords = require('..')
var should = require('chai').should()
var Ajv = require('ajv');
var defFunc = require('../keywords/transform');
var defineKeywords = require('..');
require('chai').should();

describe('keyword "transform"', function () {
var ajvs = [
defFunc(new Ajv),
defineKeywords(new Ajv, 'transform'),
defineKeywords(new Ajv)
]
];


ajvs.forEach(function (ajv, i) {
it('should transform by wrapper #' + i, function () {
var schema, data
var schema, data;

data = {o: ' Object '};
schema = {type: 'object', properties: {o: {type: 'string', transform: ['trim', 'toLowerCase']}}};
Expand All @@ -34,24 +33,24 @@ describe('keyword "transform"', function () {
ajv.validate(schema, data) .should.equal(true);
// Note: Doesn't work on plain strings due to object being undefined
data.should.equal(' String ');
})
})
});
});

ajvs.forEach(function (ajv, i) {
it('should not transform non-strings #' + i, function () {
var schema, data
var schema, data;

data = ['a', 1, null, [], {}];
schema = {type: 'array', items: {type: 'string', transform: ['toUpperCase']}};
ajv.validate(schema, data) .should.equal(false);
data.should.deep.equal(['A', 1, null, [], {}]);

})
})
});
});

ajvs.forEach(function (ajv, i) {
it('should transform trim #' + i, function () {
var schema, data
var schema, data;

data = [' trimObject '];
schema = {type: 'array', items: {type: 'string', transform: ['trimLeft']}};
Expand All @@ -72,12 +71,12 @@ describe('keyword "transform"', function () {
schema = {type: 'array', items: {type: 'string', transform: ['trim']}};
ajv.validate(schema, data) .should.equal(true);
data.should.deep.equal(['trimObject']);
})
})
});
});

ajvs.forEach(function (ajv, i) {
it('should transform text case #' + i, function () {
var schema, data
var schema, data;

data = ['MixCase'];
schema = {type: 'array', items: {type: 'string', transform: ['toLowerCase']}};
Expand Down Expand Up @@ -124,7 +123,7 @@ describe('keyword "transform"', function () {
schema = {type: 'array', items: {type: 'string', transform: ['toEnumCase'], enum:['pH']}};
ajv.validate(schema, data) .should.equal(false);
data.should.deep.equal(['ab']);
})
})
});
});

})
});

0 comments on commit 4449d17

Please sign in to comment.