Merge pull request #11804 from Automattic/gh-11580

on is no longer a reserved word gh-11580
Automattic · May 16, 2022 · 2dc8de8 · 2dc8de8
2 parents c2bd9a9 + 3d17528
commit 2dc8de8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/schema.js b/lib/schema.js
@@ -736,7 +736,6 @@ reserved['prototype'] =
 // EventEmitter
 reserved.emit =
 reserved.listeners =
-reserved.on =
 reserved.removeListener =
 
 // document properties and functions

diff --git a/test/schema.test.js b/test/schema.test.js
@@ -1438,7 +1438,7 @@ describe('schema', function() {
     describe('reserved keys are log a warning (gh-9010)', () => {
       this.afterEach(() => sinon.restore());
       const reservedProperties = [
-        'emit', 'listeners', 'on', 'removeListener', /* 'collection', */ // TODO: add `collection`
+        'emit', 'listeners', 'removeListener', /* 'collection', */ // TODO: add `collection`
         'errors', 'get', 'init', 'isModified', 'isNew', 'populated',
         'remove', 'save', 'toObject', 'validate'
       ];
@@ -2764,6 +2764,19 @@ describe('schema', function() {
     assert(batch.message);
   });
 
+  it('can use on as a schema property (gh-11580)', async() => {
+    const testSchema = new mongoose.Schema({
+      on: String
+    });
+    const Test = db.model('gh11580', testSchema);
+    await Test.create({
+      on: 'Test'
+    });
+    const result = await Test.findOne();
+    assert.ok(result);
+    assert.ok(result.on);
+  });
+
   it('disallows using schemas with schema-level projections with map subdocuments (gh-11698)', async function() {
     const subSchema = new Schema({
       selected: { type: Number },