Merge branch 'master' of github.com:Automattic/mongoose

Automattic · May 16, 2019 · a22bf13 · a22bf13
2 parents b642e17 + 7f4c2f0
commit a22bf13
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/schema/string.js b/lib/schema/string.js
@@ -577,7 +577,7 @@ SchemaString.prototype.$conditionalHandlers =
       $gte: handleSingle,
       $lt: handleSingle,
       $lte: handleSingle,
-      $options: handleSingle,
+      $options: String,
       $regex: handleSingle,
       $not: handleSingle
     });

diff --git a/test/model.query.casting.test.js b/test/model.query.casting.test.js
@@ -802,6 +802,17 @@ describe('model query casting', function() {
       assert.equal(result.tags.$options, 'img');
       done();
     });
+    it('does not cast with uppercase (gh-7800)', function(done) {
+      const testSchema = new Schema({
+        name: { type: String, uppercase: true }
+      });
+
+      const Model = db.model('gh7800', testSchema);
+      const result = Model.find({}).cast(Model, {name: {$regex: /a/, $options: 'i'}});
+
+      assert.equal(result.name.$options, 'i');
+      done();
+    });
   });
 
   describe('$elemMatch', function() {