mongoose 3.x and other fixes to test suite.

Author: panta

tests/email.test.js

@@ -1,12 +1,13 @@
-require('should');
+var should = require('should');
 var mongoose = require('mongoose')
   , Schema = mongoose.Schema
+  , SchemaTypes = mongoose.SchemaTypes || mongoose.Schema.Types
   , db = mongoose.createConnection('mongodb://localhost/mongoose_types_tests');
 
 require("../").loadTypes(mongoose, 'email');
 
 var UserSchema = new Schema({
-  email: mongoose.SchemaTypes.Email
+  email: SchemaTypes.Email
 });
 
 mongoose.model('User', UserSchema);
@@ -20,14 +21,15 @@ module.exports = {
   'test invalid email validation': function () {
     var user = new User({email: 'hello'});
     user.save(function (err) {
-      err.message.should.equal('Validator "email is invalid" failed for path email');
+      var message = err.errors.email.message || err.message;
+      message.should.equal('Validator "email is invalid" failed for path email');
       user.isNew.should.be.true;
     });
   },
   'test valid email validation': function () {
     var user = new User({ email: '[email protected]' });
     user.save(function (err) {
-      err.should.eql(null);
+      should.not.exist(err);
       user.isNew.should.be.false;
     });
   },

tests/url.test.js

@@ -1,12 +1,13 @@
-require('should');
+var should = require('should');
 var mongoose = require('mongoose')
   , Schema = mongoose.Schema
+  , SchemaTypes = mongoose.SchemaTypes || mongoose.Schema.Types
   , db = mongoose.createConnection('mongodb://localhost/mongoose_types_tests');
 
 require("../").loadTypes(mongoose, 'url');
 
 var WebpageSchema = new Schema({
-  url: mongoose.SchemaTypes.Url
+  url: SchemaTypes.Url
 });
 
 mongoose.model('Webpage', WebpageSchema);
@@ -20,14 +21,15 @@ module.exports = {
   'test invalid url validation': function () {
     var webpage = new Webpage({url: 'file:///home/'});
     webpage.save(function (err) {
-      err.message.should.equal('Validator "url is invalid" failed for path url');
+      var message = err.errors.url.message || err.message;
+      message.should.equal('Validator "url is invalid" failed for path url');
       webpage.isNew.should.be.true;
     });
   },
   'test valid url validation': function () {
     var webpage = new Webpage({ url: 'http://www.google.com/' });
     webpage.save(function (err) {
-      err.should.eql(null);
+      should.not.exist(err);
       webpage.isNew.should.be.false;
     });
   },

tests/useTimestamps.test.js

@@ -1,4 +1,4 @@
-require('should');
+var should = require('should');
 var mongoose = require('mongoose')
   , Schema = mongoose.Schema
   , db = mongoose.createConnection('mongodb://localhost/mongoose_types_tests')
@@ -17,25 +17,25 @@ module.exports = {
   before: function(done){
     TimeCop = db.model('TimeCop', TimeCopSchema);
     TimeCop.remove({}, function () {
-      done();
+      //done();
     });
   },
-  'createdAt and updatedAt should be set to the same value on creation': function (done) {
+  'createdAt and updatedAt should be set to the same value on creation': function (done, assert) {
     var cop = new TimeCop({ email: '[email protected]' });
     cop.save( function (err) {
-      cop.createdAt.should.be.an.instanceof(Date);
-      cop.updatedAt.should.be.an.instanceof(Date);
-      done();
+      (cop.createdAt instanceof Date).should.be.true;
+      (cop.updatedAt instanceof Date).should.be.true;
+      //done();
     });
   },
-  'updatedAt should be later than createdAt upon updating': function (done) {
+  'updatedAt should be later than createdAt upon updating': function (done, assert) {
     TimeCop.findOne({email: '[email protected]'}, function (err, found) {
       found.email = '[email protected]';
       setTimeout( function () {
         found.save( function (err, updated) {
-          updated.updatedAt.should.be.greater.than(updated.createdAt);
+          updated.updatedAt.should.be.above(updated.createdAt);
           assert.ok(updated.updatedAt > updated.createdAt);
-          done();
+          //done();
         });
       }, 1000);
     });