populate; fix saving populated arrays

when null or ObjectId was added relates to #570
Automattic · Feb 27, 2013 · 089e9e8 · 089e9e8
1 parent c83508a
commit 089e9e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/types/array.js b/lib/types/array.js
@@ -568,9 +568,11 @@ MongooseArray.prototype.set = function set (i, val) {
  */
 
 MongooseArray.prototype.toObject = function (options) {
-  if (options && options.depopulate && this[0] instanceof Document) {
+  if (options && options.depopulate) {
     return this.map(function (doc) {
-      return doc._id;
+      return doc && doc._id // check for documents
+        ? doc._id
+        : doc
     });
   }
 

diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -2089,8 +2089,20 @@ describe('model: populate:', function(){
           doc.fans.addToSet(_id);
           assert.equal(doc.fans[7], _id);
 
-          done();
+          doc.save(function (err) {
+            assert.ifError(err);
+            B.findById(b1).exec(function (err, doc) {
+              assert.ifError(err);
+              assert.equal(8, doc.fans.length);
+              assert.equal(doc.fans[0], user8.id);
+              assert.equal(doc.fans[5], user7.id);
+              assert.equal(doc.fans[6], null);
+              assert.equal(doc.fans[7], String(_id));
+              done();
+            })
+          })
         })
+        // TODO test setting _id directly
         // TODO test with Buffer, Number, String _ids too
       })
     })