Merge pull request #8035 from Automattic/gh8012

feat(document): run setters on defaults
Automattic · Aug 31, 2019 · 751ba48 · 751ba48
2 parents 9cae665 + 39bebda
commit 751ba48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/schematype.js b/lib/schematype.js
@@ -892,7 +892,7 @@ SchemaType.prototype.getDefault = function(scope, init) {
       ret = utils.clone(ret);
     }
 
-    const casted = this.cast(ret, scope, init);
+    const casted = this.applySetters(ret, scope, init);
     if (casted && casted.$isSingleNested) {
       casted.$parent = scope;
     }

diff --git a/test/model.test.js b/test/model.test.js
@@ -4149,19 +4149,22 @@ describe('Model', function() {
   });
 
   it('setters trigger on null values (gh-1445)', function(done) {
+    const calls = [];
     const OrderSchema = new Schema({
       total: {
         type: Number,
         default: 0,
         set: function(value) {
-          assert.strictEqual(null, value);
+          calls.push(value);
           return 10;
         }
       }
     });
 
     const Order = db.model('order' + random(), OrderSchema);
     const o = new Order({total: null});
+
+    assert.deepEqual(calls, [0, null]);
     assert.equal(o.total, 10);
     done();
   });