不要怂,就是干,撸起袖子干!

Commit ac9e3d1c by Vadim Kazakov Committed by Jan Aagaard Meier

Update validation to return null

* change validate to return null on success as per the docs
* update integration tests to use null for validation success
1 parent c74844e1
...@@ -72,6 +72,8 @@ InstanceValidator.prototype.validate = function() { ...@@ -72,6 +72,8 @@ InstanceValidator.prototype.validate = function() {
})).then(function() { })).then(function() {
if (self.errors.length) { if (self.errors.length) {
return new sequelizeError.ValidationError(null, self.errors); return new sequelizeError.ValidationError(null, self.errors);
} else {
return null;
} }
}); });
}; };
......
...@@ -373,7 +373,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() { ...@@ -373,7 +373,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() {
var successfulUser = User.build({ name: '2' }); var successfulUser = User.build({ name: '2' });
return successfulUser.validate().then(function(err) { return successfulUser.validate().then(function(err) {
expect(err).to.be.undefined; expect(err).to.be.null;
}); });
}); });
}); });
...@@ -402,7 +402,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() { ...@@ -402,7 +402,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() {
expect(error.get('name')[0].message).to.equal('Invalid username'); expect(error.get('name')[0].message).to.equal('Invalid username');
return User.build({ name: 'no error' }).validate().then(function(errors) { return User.build({ name: 'no error' }).validate().then(function(errors) {
expect(errors).to.be.undefined; expect(errors).to.be.null;
}); });
}); });
}); });
...@@ -698,14 +698,14 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() { ...@@ -698,14 +698,14 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() {
password: 'short', password: 'short',
salt: '42' salt: '42'
}).validate().then(function(errors) { }).validate().then(function(errors) {
expect(errors).not.to.be.undefined; expect(errors).not.to.be.null;
expect(errors.get('password')[0].message).to.equal('Please choose a longer password'); expect(errors.get('password')[0].message).to.equal('Please choose a longer password');
}), }),
User.build({ User.build({
password: 'loooooooong', password: 'loooooooong',
salt: '42' salt: '42'
}).validate().then(function(errors) { }).validate().then(function(errors) {
expect(errors).to.be.undefined; expect(errors).to.be.null;
}) })
]); ]);
}); });
...@@ -727,7 +727,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() { ...@@ -727,7 +727,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() {
return User.build({ return User.build({
name: 'abcdefg' name: 'abcdefg'
}).validate().then(function(errors) { }).validate().then(function(errors) {
expect(errors === undefined).to.be.ok; expect(errors).to.be.null;
return User.build({ return User.build({
name: 'a' name: 'a'
......
...@@ -49,7 +49,7 @@ describe(Support.getTestDialectTeaser('Instance'), function() { ...@@ -49,7 +49,7 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
expect(instance.get('updated_time')).to.be.an.instanceof(Date); expect(instance.get('updated_time')).to.be.an.instanceof(Date);
return instance.validate().then(function(err) { return instance.validate().then(function(err) {
expect(err).to.be.equal(undefined); expect(err).to.be.equal(null);
}); });
}); });
...@@ -95,4 +95,4 @@ describe(Support.getTestDialectTeaser('Instance'), function() { ...@@ -95,4 +95,4 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
expect(instance.get('number2')).to.equal(2); expect(instance.get('number2')).to.equal(2);
}); });
}); });
}); });
\ No newline at end of file
...@@ -231,7 +231,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() { ...@@ -231,7 +231,7 @@ describe(Support.getTestDialectTeaser('InstanceValidator'), function() {
}); });
var successfulUser = UserSuccess.build({ name: succeedingValue }); var successfulUser = UserSuccess.build({ name: succeedingValue });
return successfulUser.validate().then(function(errors) { return successfulUser.validate().then(function(errors) {
expect(errors).to.be.undefined; expect(errors).to.be.null;
}).catch(function(err) { }).catch(function(err) {
expect(err).to.deep.equal({}); expect(err).to.deep.equal({});
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!