test: fix tests re: #8273

Automattic · Nov 3, 2019 · c1e49c3 · c1e49c3
1 parent dfde779
commit c1e49c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -1170,6 +1170,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
     if (schema.$isMongooseDocumentArray &&
         Array.isArray(val) &&
         val.length > 0 &&
+        val[0] != null &&
         val[0].$__ != null &&
         val[0].$__.populated != null) {
       const populatedPaths = Object.keys(val[0].$__.populated);

diff --git a/lib/types/documentarray.js b/lib/types/documentarray.js
@@ -86,7 +86,7 @@ class CoreDocumentArray extends CoreMongooseArray {
         }
       }
     }
-    
+
     if (Constructor.$isMongooseDocumentArray) {
       return Constructor.cast(value, this, undefined, undefined, index);
     }

diff --git a/test/model.update.test.js b/test/model.update.test.js
@@ -2510,7 +2510,7 @@ describe('model: update:', function() {
         catch(done);
     });
 
-    it('$pullAll with null (gh-5164)', function(done) {
+    it('$pullAll with null (gh-5164)', function() {
       const schema = new Schema({
         name: String,
         arr: [{ name: String }]
@@ -2519,7 +2519,7 @@ describe('model: update:', function() {
 
       const doc = new Test({ name: 'Test', arr: [null, {name: 'abc'}] });
 
-      doc.save().
+      return doc.save().
         then(function(doc) {
           return Test.update({ _id: doc._id }, {
             $pullAll: { arr: [null] }
@@ -2531,9 +2531,7 @@ describe('model: update:', function() {
         then(function(doc) {
           assert.equal(doc.arr.length, 1);
           assert.equal(doc.arr[0].name, 'abc');
-          done();
-        }).
-        catch(done);
+        });
     });
 
     it('$set array (gh-5403)', function(done) {