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

fix: support numbers in validatesFormatOf 

Fix for #1437
This commit is contained in:
Tom Kirkpatrick 2017-07-26 09:13:29 +02:00 committed by biniam
parent c813bf19fb
commit 138b99c703
2 changed files with 44 additions and 10 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 {

50
test/validations.test.js
View File

@ -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() {