chore: clean up test failures on 6.0 branch re: #9909

Automattic · Feb 16, 2021 · 13236a9 · 13236a9
1 parent 623fff8
commit 13236a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/schema/array.js b/lib/schema/array.js
@@ -269,9 +269,10 @@ SchemaArray.prototype.applyGetters = function(value, scope) {
 
   const ret = SchemaType.prototype.applyGetters.call(this, value, scope);
   if (Array.isArray(ret)) {
-    const len = ret.length;
+    const rawValue = ret.isMongooseArrayProxy ? ret.__array : ret;
+    const len = rawValue.length;
     for (let i = 0; i < len; ++i) {
-      ret[i] = this.caster.applyGetters(ret[i], scope);
+      rawValue[i] = this.caster.applyGetters(rawValue[i], scope);
     }
   }
   return ret;

diff --git a/lib/types/array/methods/index.js b/lib/types/array/methods/index.js
@@ -280,7 +280,7 @@ const methods = {
       if (arguments.length) {
         dirtyPath = dirtyPath + '.' + elem;
       }
-  
+
       if (dirtyPath != null && dirtyPath.endsWith('.$')) {
         return this;
       }

diff --git a/lib/types/subdocument.js b/lib/types/subdocument.js
@@ -280,6 +280,9 @@ Subdocument.prototype.$parent = Subdocument.prototype.parent;
  */
 
 Subdocument.prototype.$__remove = function(cb) {
+  if (cb == null) {
+    return;
+  }
   return cb(null, this);
 };
 
@@ -306,9 +309,7 @@ Subdocument.prototype.remove = function(options, callback) {
     this.$__removeFromParent();
   }
 
-  if (typeof callback === 'function') {
-    callback(null);
-  }
+  return this.$__remove(callback);
 };
 
 /*!