Merge pull request #1450 from strongloop/fix/validation-callback
Fix update validation callback
This commit is contained in:
commit
b8739cf80f
|
@ -2701,7 +2701,7 @@ DataAccessObject.updateAll = function(where, data, options, cb) {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
doUpdate(ctx.where, ctx.data);
|
doUpdate(ctx.where, ctx.data);
|
||||||
} else {
|
} else {
|
||||||
cb(new ValidationError(inst), inst);
|
cb(new ValidationError(inst));
|
||||||
}
|
}
|
||||||
}, options);
|
}, options);
|
||||||
});
|
});
|
||||||
|
|
|
@ -437,6 +437,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: 'Foo-new'},
|
Employee.updateAll({where: {id: 1}}, {name: 'Foo-new'},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.age[0], 'can\'t be blank');
|
should.equal(err.details.messages.age[0], 'can\'t be blank');
|
||||||
done();
|
done();
|
||||||
|
@ -495,6 +496,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: 'Foo-new', age: 5},
|
Employee.updateAll({where: {id: 1}}, {name: 'Foo-new', age: 5},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.name[0], 'can\'t be set');
|
should.equal(err.details.messages.name[0], 'can\'t be set');
|
||||||
done();
|
done();
|
||||||
|
@ -751,6 +753,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: 'Bar', age: 5},
|
Employee.updateAll({where: {id: 1}}, {name: 'Bar', age: 5},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.name[0], 'is not unique');
|
should.equal(err.details.messages.name[0], 'is not unique');
|
||||||
done();
|
done();
|
||||||
|
@ -825,6 +828,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: '45foo', age: 5},
|
Employee.updateAll({where: {id: 1}}, {name: '45foo', age: 5},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.name[0], 'is invalid');
|
should.equal(err.details.messages.name[0], 'is invalid');
|
||||||
done();
|
done();
|
||||||
|
@ -931,6 +935,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {age: {someAge: 5}},
|
Employee.updateAll({where: {id: 1}}, {age: {someAge: 5}},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.age[0], 'is not a number');
|
should.equal(err.details.messages.age[0], 'is not a number');
|
||||||
done();
|
done();
|
||||||
|
@ -1047,6 +1052,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: 'Foo-new2', age: 5},
|
Employee.updateAll({where: {id: 1}}, {name: 'Foo-new2', age: 5},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.name[0], 'is not included in ' +
|
should.equal(err.details.messages.name[0], 'is not included in ' +
|
||||||
'the list');
|
'the list');
|
||||||
|
@ -1145,6 +1151,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
|
Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.name[0], 'is reserved');
|
should.equal(err.details.messages.name[0], 'is reserved');
|
||||||
done();
|
done();
|
||||||
|
@ -1194,6 +1201,7 @@ describe('validations', function() {
|
||||||
Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
|
Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
|
||||||
function(err, emp) {
|
function(err, emp) {
|
||||||
should.exist(err);
|
should.exist(err);
|
||||||
|
should.not.exist(emp);
|
||||||
should.equal(err.statusCode, 422);
|
should.equal(err.statusCode, 422);
|
||||||
should.equal(err.details.messages.name[0], 'too short');
|
should.equal(err.details.messages.name[0], 'too short');
|
||||||
done();
|
done();
|
||||||
|
|
Loading…
Reference in New Issue