From 9cd0108fc6892e6089459e61034f410fae1b8c04 Mon Sep 17 00:00:00 2001
From: ssh24 <sshasan10@hotmail.com>
Date: Wed, 2 Aug 2017 14:55:47 -0400
Subject: [PATCH] Fix update validation callback

---
 lib/dao.js               | 2 +-
 test/validations.test.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/dao.js b/lib/dao.js
index e2318d18..87497476 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -2701,7 +2701,7 @@ DataAccessObject.updateAll = function(where, data, options, cb) {
           if (valid) {
             doUpdate(ctx.where, ctx.data);
           } else {
-            cb(new ValidationError(inst), inst);
+            cb(new ValidationError(inst));
           }
         }, options);
       });
diff --git a/test/validations.test.js b/test/validations.test.js
index c75d6853..c3a2ee8c 100644
--- a/test/validations.test.js
+++ b/test/validations.test.js
@@ -437,6 +437,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Foo-new'},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.age[0], 'can\'t be blank');
             done();
@@ -495,6 +496,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Foo-new', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.name[0], 'can\'t be set');
             done();
@@ -751,6 +753,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Bar', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.name[0], 'is not unique');
             done();
@@ -825,6 +828,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: '45foo', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.name[0], 'is invalid');
             done();
@@ -931,6 +935,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {age: {someAge: 5}},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.age[0], 'is not a number');
             done();
@@ -1047,6 +1052,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Foo-new2', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.name[0], 'is not included in ' +
             'the list');
@@ -1145,6 +1151,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.name[0], 'is reserved');
             done();
@@ -1194,6 +1201,7 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.not.exist(emp);
             should.equal(err.statusCode, 422);
             should.equal(err.details.messages.name[0], 'too short');
             done();