verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1438 from fullcube/tkp/validatesFormatOf-numbers-1437 

fix: support numbers in validatesFormatOf
This commit is contained in:
Biniam Admikew 2017-08-03 16:01:26 -04:00 committed by GitHub
parent c813bf19fb 1ebad655e4
commit 0ca56309ea
2 changed files with 100 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/validations.js
View File

@ -361,8 +361,8 @@ function validateExclusion(attr, conf, err, options) {
function validateFormat(attr, conf, err, options) { function validateFormat(attr, conf, err, options) {
if (nullCheck.call(this, attr, conf, err)) return; if (nullCheck.call(this, attr, conf, err)) return;
if (typeof this[attr] === 'string') { if (typeof this[attr] === 'string' || typeof this[attr] === 'number') {
if (!this[attr].match(conf['with'])) { if (!conf['with'].test(this[attr])) {
err(); err();
} }
} else { } else {

162
test/validations.test.js
View File

@ -78,40 +78,40 @@ describe('validations', function() {
User.validatesPresenceOf('pendingPeriod', {if: 'createdByAdmin'}); User.validatesPresenceOf('pendingPeriod', {if: 'createdByAdmin'});
var user = new User; var user = new User;
user.createdByAdmin = true; user.createdByAdmin = true;
user.isValid().should.be.false; user.isValid().should.be.false();
user.errors.pendingPeriod.should.eql(['can\'t be blank']); user.errors.pendingPeriod.should.eql(['can\'t be blank']);
user.pendingPeriod = 1; user.pendingPeriod = 1;
user.isValid().should.be.true; user.isValid().should.be.true();
}); });
it('should skip when `if` is NOT fulfilled', function() { it('should skip when `if` is NOT fulfilled', function() {
User.validatesPresenceOf('pendingPeriod', {if: 'createdByAdmin'}); User.validatesPresenceOf('pendingPeriod', {if: 'createdByAdmin'});
var user = new User; var user = new User;
user.createdByAdmin = false; user.createdByAdmin = false;
user.isValid().should.be.true; user.isValid().should.be.true();
user.errors.should.be.false; user.errors.should.be.false();
user.pendingPeriod = 1; user.pendingPeriod = 1;
user.isValid().should.be.true; user.isValid().should.be.true();
}); });
it('should NOT skip when `unless` is fulfilled', function() { it('should NOT skip when `unless` is fulfilled', function() {
User.validatesPresenceOf('pendingPeriod', {unless: 'createdByAdmin'}); User.validatesPresenceOf('pendingPeriod', {unless: 'createdByAdmin'});
var user = new User; var user = new User;
user.createdByAdmin = false; user.createdByAdmin = false;
user.isValid().should.be.false; user.isValid().should.be.false();
user.errors.pendingPeriod.should.eql(['can\'t be blank']); user.errors.pendingPeriod.should.eql(['can\'t be blank']);
user.pendingPeriod = 1; user.pendingPeriod = 1;
user.isValid().should.be.true; user.isValid().should.be.true();
}); });
it('should skip when `unless` is NOT fulfilled', function() { it('should skip when `unless` is NOT fulfilled', function() {
User.validatesPresenceOf('pendingPeriod', {unless: 'createdByAdmin'}); User.validatesPresenceOf('pendingPeriod', {unless: 'createdByAdmin'});
var user = new User; var user = new User;
user.createdByAdmin = true; user.createdByAdmin = true;
user.isValid().should.be.true; user.isValid().should.be.true();
user.errors.should.be.false; user.errors.should.be.false();
user.pendingPeriod = 1; user.pendingPeriod = 1;
user.isValid().should.be.true; user.isValid().should.be.true();
}); });
}); });
@ -124,8 +124,8 @@ describe('validations', function() {
var user = new User; var user = new User;
user.createdByAdmin = false; user.createdByAdmin = false;
user.isValid(function(valid) { user.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
user.errors.should.be.false; user.errors.should.be.false();
done(); done();
}); });
}); });
@ -138,7 +138,7 @@ describe('validations', function() {
var user = new User; var user = new User;
user.createdByAdmin = true; user.createdByAdmin = true;
user.isValid(function(valid) { user.isValid(function(valid) {
valid.should.be.false; valid.should.be.false();
user.errors.pendingPeriod.should.eql(['can\'t be blank']); user.errors.pendingPeriod.should.eql(['can\'t be blank']);
done(); done();
}); });
@ -152,8 +152,8 @@ describe('validations', function() {
var user = new User; var user = new User;
user.createdByAdmin = true; user.createdByAdmin = true;
user.isValid(function(valid) { user.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
user.errors.should.be.false; user.errors.should.be.false();
done(); done();
}); });
}); });
@ -166,7 +166,7 @@ describe('validations', function() {
var user = new User; var user = new User;
user.createdByAdmin = false; user.createdByAdmin = false;
user.isValid(function(valid) { user.isValid(function(valid) {
valid.should.be.false; valid.should.be.false();
user.errors.pendingPeriod.should.eql(['can\'t be blank']); user.errors.pendingPeriod.should.eql(['can\'t be blank']);
done(); done();
}); });
@ -362,43 +362,43 @@ describe('validations', function() {
validations.email.should.eql([{validation: 'presence', options: {}}]); validations.email.should.eql([{validation: 'presence', options: {}}]);
var u = new User; var u = new User;
u.isValid().should.not.be.true; u.isValid().should.not.be.true();
u.name = 1; u.name = 1;
u.isValid().should.not.be.true; u.isValid().should.not.be.true();
u.email = 2; u.email = 2;
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should reject NaN value as a number', function() { it('should reject NaN value as a number', function() {
User.validatesPresenceOf('age'); User.validatesPresenceOf('age');
var u = new User(); var u = new User();
u.isValid().should.be.false; u.isValid().should.be.false();
u.age = NaN; u.age = NaN;
u.isValid().should.be.false; u.isValid().should.be.false();
u.age = 1; u.age = 1;
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should allow "NaN" value as a string', function() { it('should allow "NaN" value as a string', function() {
User.validatesPresenceOf('name'); User.validatesPresenceOf('name');
var u = new User(); var u = new User();
u.isValid().should.be.false; u.isValid().should.be.false();
u.name = 'NaN'; u.name = 'NaN';
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should skip validation by property (if/unless)', function() { it('should skip validation by property (if/unless)', function() {
User.validatesPresenceOf('domain', {unless: 'createdByScript'}); User.validatesPresenceOf('domain', {unless: 'createdByScript'});
var user = new User(getValidAttributes()); var user = new User(getValidAttributes());
user.isValid().should.be.true; user.isValid().should.be.true();
user.createdByScript = false; user.createdByScript = false;
user.isValid().should.be.false; user.isValid().should.be.false();
user.errors.domain.should.eql(['can\'t be blank']); user.errors.domain.should.eql(['can\'t be blank']);
user.domain = 'domain'; user.domain = 'domain';
user.isValid().should.be.true; user.isValid().should.be.true();
}); });
describe('validate presence on update', function() { describe('validate presence on update', function() {
@ -452,11 +452,11 @@ describe('validations', function() {
it('should validate absence', function() { it('should validate absence', function() {
User.validatesAbsenceOf('reserved', {if: 'locked'}); User.validatesAbsenceOf('reserved', {if: 'locked'});
var u = new User({reserved: 'foo', locked: true}); var u = new User({reserved: 'foo', locked: true});
u.isValid().should.not.be.true; u.isValid().should.not.be.true();
u.reserved = null; u.reserved = null;
u.isValid().should.be.true; u.isValid().should.be.true();
u = new User({reserved: 'foo', locked: false}); u = new User({reserved: 'foo', locked: false});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
describe('validate absence on update', function() { describe('validate absence on update', function() {
@ -512,26 +512,26 @@ describe('validations', function() {
User.validatesUniquenessOf('email'); User.validatesUniquenessOf('email');
var u = new User({email: 'hey'}); var u = new User({email: 'hey'});
Boolean(u.isValid(function(valid) { Boolean(u.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
u.save(function() { u.save(function() {
var u2 = new User({email: 'hey'}); var u2 = new User({email: 'hey'});
u2.isValid(function(valid) { u2.isValid(function(valid) {
valid.should.be.false; valid.should.be.false();
done(); done();
}); });
}); });
})).should.be.false; })).should.be.false();
}); });
it('should handle same object modification', function(done) { it('should handle same object modification', function(done) {
User.validatesUniquenessOf('email'); User.validatesUniquenessOf('email');
var u = new User({email: 'hey'}); var u = new User({email: 'hey'});
Boolean(u.isValid(function(valid) { Boolean(u.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
u.save(function() { u.save(function() {
u.name = 'Goghi'; u.name = 'Goghi';
u.isValid(function(valid) { u.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
u.save(done); u.save(done);
}); });
}); });
@ -563,7 +563,7 @@ describe('validations', function() {
function validateDuplicateUser(user2, next) { function validateDuplicateUser(user2, next) {
var user3 = new SiteUser({siteId: 1, email: EMAIL}); var user3 = new SiteUser({siteId: 1, email: EMAIL});
user3.isValid(function(valid) { user3.isValid(function(valid) {
valid.should.be.false; valid.should.be.false();
next(); next();
}); });
}, },
@ -579,15 +579,15 @@ describe('validations', function() {
User.validatesUniquenessOf('email'); User.validatesUniquenessOf('email');
var u = new User({email: ' '}); var u = new User({email: ' '});
Boolean(u.isValid(function(valid) { Boolean(u.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
u.save(function() { u.save(function() {
var u2 = new User({email: null}); var u2 = new User({email: null});
u2.isValid(function(valid) { u2.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
done(); done();
}); });
}); });
})).should.be.false; })).should.be.false();
}); });
it('should work with if/unless', function(done) { it('should work with if/unless', function(done) {
@ -597,27 +597,27 @@ describe('validations', function() {
}); });
var u = new User({email: 'hello'}); var u = new User({email: 'hello'});
Boolean(u.isValid(function(valid) { Boolean(u.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
done(); done();
})).should.be.false; })).should.be.false();
}); });
it('should work with id property on create', function(done) { it('should work with id property on create', function(done) {
Entry.create({id: 'entry'}, function(err, entry) { Entry.create({id: 'entry'}, function(err, entry) {
var e = new Entry({id: 'entry'}); var e = new Entry({id: 'entry'});
Boolean(e.isValid(function(valid) { Boolean(e.isValid(function(valid) {
valid.should.be.false; valid.should.be.false();
done(); done();
})).should.be.false; })).should.be.false();
}); });
}); });
it('should work with id property after create', function(done) { it('should work with id property after create', function(done) {
Entry.findById('entry', function(err, e) { Entry.findById('entry', function(err, e) {
Boolean(e.isValid(function(valid) { Boolean(e.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
done(); done();
})).should.be.false; })).should.be.false();
}); });
}); });
@ -765,31 +765,65 @@ describe('validations', function() {
}); });
describe('format', function() { describe('format', function() {
it('should validate format'); it('should validate the format of valid strings', function() {
it('should overwrite default blank message with custom format message'); User.validatesFormatOf('name', {with: /[a-z][A-Z]*$/});
var u = new User({name: 'valid name'});
u.isValid().should.be.true();
});
it('should skip missing values when allowing null', function() { it('should validate the format of invalid strings', function() {
User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/, allowNull: true}); User.validatesFormatOf('name', {with: /[a-z][A-Z]*$/});
var u = new User({name: 'invalid name!'});
u.isValid().should.be.false();
});
it('should validate the format of valid numbers', function() {
User.validatesFormatOf('age', {with: /^\d+$/});
var u = new User({age: 30});
u.isValid().should.be.true();
});
it('should validate the format of invalid numbers', function() {
User.validatesFormatOf('age', {with: /^\d+$/});
var u = new User({age: 'thirty'});
u.isValid().should.be.false();
});
it('should overwrite default blank message with custom format message', function() {
var CUSTOM_MESSAGE = 'custom validation message';
User.validatesFormatOf('name', {with: /[a-z][A-Z]*$/, message: CUSTOM_MESSAGE});
var u = new User({name: 'invalid name string 123'});
u.isValid().should.be.false();
u.errors.should.eql({
name: [CUSTOM_MESSAGE],
codes: {
name: ['format'],
},
});
});
it('should skip missing values when allowing blank', function() {
User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/, allowBlank: true});
var u = new User({}); var u = new User({});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should skip null values when allowing null', function() { it('should skip null values when allowing null', function() {
User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/, allowNull: true}); User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/, allowNull: true});
var u = new User({email: null}); var u = new User({email: null});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should not skip missing values', function() { it('should not skip missing values', function() {
User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/}); User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/});
var u = new User({}); var u = new User({});
u.isValid().should.be.false; u.isValid().should.be.false();
}); });
it('should not skip null values', function() { it('should not skip null values', function() {
User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/}); User.validatesFormatOf('email', {with: /^\S+@\S+\.\S+$/});
var u = new User({email: null}); var u = new User({email: null});
u.isValid().should.be.false; u.isValid().should.be.false();
}); });
describe('validate format on update', function() { describe('validate format on update', function() {
@ -1218,7 +1252,7 @@ describe('validations', function() {
if (this.email === 'hello') err(); if (this.email === 'hello') err();
}, {code: 'invalid-email'}); }, {code: 'invalid-email'});
var u = new User({email: 'hello'}); var u = new User({email: 'hello'});
Boolean(u.isValid()).should.be.false; Boolean(u.isValid()).should.be.false();
u.errors.codes.should.eql({email: ['invalid-email']}); u.errors.codes.should.eql({email: ['invalid-email']});
}); });
@ -1230,7 +1264,7 @@ describe('validations', function() {
} }
}); });
var u = new User({email: 'hello'}); var u = new User({email: 'hello'});
Boolean(u.isValid()).should.be.false; Boolean(u.isValid()).should.be.false();
u.errors.should.eql({email: ['Cannot be `hello`']}); u.errors.should.eql({email: ['Cannot be `hello`']});
u.errors.codes.should.eql({email: ['invalid-email']}); u.errors.codes.should.eql({email: ['invalid-email']});
}); });
@ -1244,9 +1278,9 @@ describe('validations', function() {
}); });
var u = new User({email: 'hello'}); var u = new User({email: 'hello'});
Boolean(u.isValid(function(valid) { Boolean(u.isValid(function(valid) {
valid.should.be.true; valid.should.be.true();
done(); done();
})).should.be.false; })).should.be.false();
}); });
}); });
@ -1323,31 +1357,31 @@ describe('validations', function() {
it('should validate a date object', function() { it('should validate a date object', function() {
User.validatesDateOf('updatedAt'); User.validatesDateOf('updatedAt');
var u = new User({updatedAt: new Date()}); var u = new User({updatedAt: new Date()});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should validate a date string', function() { it('should validate a date string', function() {
User.validatesDateOf('updatedAt'); User.validatesDateOf('updatedAt');
var u = new User({updatedAt: '2000-01-01'}); var u = new User({updatedAt: '2000-01-01'});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should validate a null date', function() { it('should validate a null date', function() {
User.validatesDateOf('updatedAt'); User.validatesDateOf('updatedAt');
var u = new User({updatedAt: null}); var u = new User({updatedAt: null});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should validate an undefined date', function() { it('should validate an undefined date', function() {
User.validatesDateOf('updatedAt'); User.validatesDateOf('updatedAt');
var u = new User({updatedAt: undefined}); var u = new User({updatedAt: undefined});
u.isValid().should.be.true; u.isValid().should.be.true();
}); });
it('should validate an invalid date string', function() { it('should validate an invalid date string', function() {
User.validatesDateOf('updatedAt'); User.validatesDateOf('updatedAt');
var u = new User({updatedAt: 'invalid date string'}); var u = new User({updatedAt: 'invalid date string'});
u.isValid().should.not.be.true; u.isValid().should.not.be.true();
u.errors.should.eql({ u.errors.should.eql({
updatedAt: ['is not a valid date'], updatedAt: ['is not a valid date'],
codes: { codes: {
@ -1371,7 +1405,7 @@ describe('validations', function() {
updatedAt: Date, updatedAt: Date,
}); });
var u = new AnotherUser({updatedAt: 'invalid date string'}); var u = new AnotherUser({updatedAt: 'invalid date string'});
u.isValid().should.not.be.true; u.isValid().should.not.be.true();
u.errors.should.eql({ u.errors.should.eql({
updatedAt: ['is not a valid date'], updatedAt: ['is not a valid date'],
codes: { codes: {
@ -1384,7 +1418,7 @@ describe('validations', function() {
var CUSTOM_MESSAGE = 'custom validation message'; var CUSTOM_MESSAGE = 'custom validation message';
User.validatesDateOf('updatedAt', {message: CUSTOM_MESSAGE}); User.validatesDateOf('updatedAt', {message: CUSTOM_MESSAGE});
var u = new User({updatedAt: 'invalid date string'}); var u = new User({updatedAt: 'invalid date string'});
u.isValid().should.not.be.true; u.isValid().should.not.be.true();
u.errors.should.eql({ u.errors.should.eql({
updatedAt: [CUSTOM_MESSAGE], updatedAt: [CUSTOM_MESSAGE],
codes: { codes: {