Apply feedback

loopbackio · Jul 31, 2017 · 198ae85 · 198ae85
1 parent 5fe2c6b
commit 198ae85
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/dao.js b/lib/dao.js
@@ -2698,9 +2698,6 @@ DataAccessObject.updateAll = function(where, data, options, cb) {
         }
         update = inst.toObject(false);
 
-        Model.applyProperties(update, inst);
-        Model = Model.lookupModel(update);
-
         // validation required
         inst.isValid(function(valid) {
           if (valid) {

diff --git a/test/validations.test.js b/test/validations.test.js
@@ -429,6 +429,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Foo-new'},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.age[0], 'can\'t be blank');
             done();
           });
       });
@@ -476,6 +478,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Foo-new', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.name[0], 'can\'t be set');
             done();
           });
       });
@@ -722,6 +726,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Bar', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.name[0], 'is not unique');
             done();
           });
       });
@@ -786,6 +792,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: '45foo', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.name[0], 'is invalid');
             done();
           });
       });
@@ -882,6 +890,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {age: {someAge: 5}},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.age[0], 'is not a number');
             done();
           });
       });
@@ -988,6 +998,9 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Foo-new2', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.name[0], 'is not included in ' +
+            'the list');
             done();
           });
       });
@@ -1075,6 +1088,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.name[0], 'is reserved');
             done();
           });
       });
@@ -1114,6 +1129,8 @@ describe('validations', function() {
         Employee.updateAll({where: {id: 1}}, {name: 'Bob', age: 5},
           function(err, emp) {
             should.exist(err);
+            should.equal(err.statusCode, 422);
+            should.equal(err.details.messages.name[0], 'too short');
             done();
           });
       });