Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/helpers/setDefaultsOnInsert.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module.exports = function(filter, schema, castedDoc, options, queryMongooseOptio
if (schemaType.path === '_id' && schemaType.options.auto) {
return;
}
const def = schemaType.getDefault(null, true, { context });
const def = schemaType.getDefault(null, false, { context });
if (typeof def === 'undefined') {
return;
}
Expand Down
19 changes: 19 additions & 0 deletions test/helpers/setDefaultsOnInsert.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,25 @@ describe('setDefaultsOnInsert', function() {
assert.equal(update.$setOnInsert['referralConversion'], 'bar');
});

it('runs setters on default values (gh-16051)', function() {
const schema = new Schema({
name: String,
slug: {
type: String,
default: 'Hello World!',
set: function(v) {
return v.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '');
}
}
});

const opts = { upsert: true, setDefaultsOnInsert: true };
let update = { $set: { name: 'test' } };
update = setDefaultsOnInsert({}, schema, update, opts);

assert.equal(update.$setOnInsert['slug'], 'hello-world');
});

it('skips default if parent is $set (gh-12279)', function() {
const SubscriptionsConfigSchema = Schema({
hasPaidSubscription: { type: Boolean, required: true },
Expand Down
14 changes: 4 additions & 10 deletions test/model.updateOne.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -624,18 +624,14 @@ describe('model: updateOne:', function() {

});

it('setDefaultsOnInsert does not run setters on default values (gh-16025)', async function() {
const setterContexts = [];
it('setDefaultsOnInsert runs setters on default values (gh-16051)', async function() {
const schema = new Schema({
name: String,
slug: {
type: String,
default: function() {
return this.get('name');
},
default: 'Hello World!',
set: function(v) {
setterContexts.push(this);
return v;
return v.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '');
}
}
});
Expand All @@ -647,10 +643,8 @@ describe('model: updateOne:', function() {
{ upsert: true, setDefaultsOnInsert: true }
);

assert.equal(setterContexts.length, 0);

const doc = await Test.findOne({ name: 'foo' });
assert.equal(doc.slug, 'foo');
assert.equal(doc.slug, 'hello-world');
});

it('avoids nested paths if setting parent path (gh-4911)', function(done) {
Expand Down