From 4449d17430256936a15201c97c621f074de03e3b Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Sat, 9 Feb 2019 16:30:31 +0000 Subject: [PATCH] style fixes, closes #81 --- .eslintrc.yml | 2 ++ package.json | 16 +++++++------- spec/dynamicDefaults.spec.js | 42 ++++++++++++++++++------------------ spec/formatLimit.spec.js | 2 +- spec/patternRequired.spec.js | 2 +- spec/select.spec.js | 2 +- spec/transform.spec.js | 39 ++++++++++++++++----------------- 7 files changed, 53 insertions(+), 52 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index b35a8c2..b5fc6a6 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -1,5 +1,7 @@ env: node: true + mocha: true + es6: true extends: 'eslint:recommended' globals: Promise: false diff --git a/package.json b/package.json index 25f4202..d4441c8 100644 --- a/package.json +++ b/package.json @@ -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" }, @@ -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" } } diff --git a/spec/dynamicDefaults.spec.js b/spec/dynamicDefaults.spec.js index 2bfa641..9fbd916 100644 --- a/spec/dynamicDefaults.spec.js +++ b/spec/dynamicDefaults.spec.js @@ -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'); } }); @@ -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(); diff --git a/spec/formatLimit.spec.js b/spec/formatLimit.spec.js index a284a64..3ba02b6 100644 --- a/spec/formatLimit.spec.js +++ b/spec/formatLimit.spec.js @@ -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() { diff --git a/spec/patternRequired.spec.js b/spec/patternRequired.spec.js index 7c69807..5868b3f 100644 --- a/spec/patternRequired.spec.js +++ b/spec/patternRequired.spec.js @@ -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() { diff --git a/spec/select.spec.js b/spec/select.spec.js index 12ab45a..844d504 100644 --- a/spec/select.spec.js +++ b/spec/select.spec.js @@ -19,7 +19,7 @@ describe('keyword "select"', function() { var validate = ajv.compile({ select: { $data: '0/type' } }); - + should.throw(function() { validate({type: 'foo'}); }); diff --git a/spec/transform.spec.js b/spec/transform.spec.js index 6440330..a7b630b 100644 --- a/spec/transform.spec.js +++ b/spec/transform.spec.js @@ -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']}}}; @@ -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']}}; @@ -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']}}; @@ -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']); - }) - }) + }); + }); -}) +});