test: fix tests re: #8725

lib/cast/number.js

@@ -14,7 +14,6 @@ const assert = require('assert');
  */
 
 module.exports = function castNumber(val) {
-
   if (val == null) {
     return val;
   }

lib/query.js

@@ -2174,6 +2174,8 @@ Query.prototype._findOne = wrapThunk(function(callback) {
  */
 
 Query.prototype.findOne = function(conditions, projection, options, callback) {
+  this.op = 'findOne';
+
   if (typeof conditions === 'function') {
     callback = conditions;
     conditions = null;
@@ -2191,8 +2193,6 @@ Query.prototype.findOne = function(conditions, projection, options, callback) {
   // make sure we don't send in the whole Document to merge()
   conditions = utils.toObject(conditions);
 
-  this.op = 'findOne';
-
   if (options) {
     this.setOptions(options);
   }
@@ -2498,6 +2498,7 @@ Query.prototype.__distinct = wrapThunk(function __distinct(callback) {
  */
 
 Query.prototype.distinct = function(field, conditions, callback) {
+  this.op = 'distinct';
   if (!callback) {
     if (typeof conditions === 'function') {
       callback = conditions;
@@ -2522,7 +2523,6 @@ Query.prototype.distinct = function(field, conditions, callback) {
   if (field != null) {
     this._distinct = field;
   }
-  this.op = 'distinct';
 
   if (callback != null) {
     this.exec(callback);

lib/schema/array.js

@@ -349,6 +349,12 @@ SchemaArray.prototype.cast = function(value, doc, init) {
     if (this.caster && this.casterConstructor !== Mixed) {
       try {
         for (i = 0, l = value.length; i < l; i++) {
+          // Special case: number arrays disallow undefined.
+          // Re: gh-840
+          // See commit 1298fe92d2c790a90594bd08199e45a4a09162a6
+          if (this.caster.instance === 'Number' && value[i] === void 0) {
+            throw new MongooseError('Mongoose number arrays disallow storing undefined');
+          }
           value[i] = this.caster.cast(value[i], doc, init);
         }
       } catch (e) {

test/types.array.test.js

@@ -1769,7 +1769,7 @@ describe('types array', function() {
 
   describe('of number', function() {
     it('allows nulls', function(done) {
-      const schema = new Schema({ x: [Number] }, { collection: 'nullsareallowed' + random() });
+      const schema = new Schema({ x: [Number] });
       const M = db.model('Test', schema);
       let m;
 

test/types.number.test.js

@@ -27,18 +27,6 @@ describe('types.number', function() {
     done();
   });
 
-  it('undefined throws number cast error', function(done) {
-    const n = new SchemaNumber();
-    let err;
-    try {
-      n.cast(undefined);
-    } catch (e) {
-      err = e;
-    }
-    assert.strictEqual(true, !!err);
-    done();
-  });
-
   it('array throws cast number error', function(done) {
     const n = new SchemaNumber();
     let err;