From cf7a3f0486a66e9ec75170848be6b1d9224d1bd4 Mon Sep 17 00:00:00 2001 From: Richard McIntyre Date: Wed, 18 Dec 2013 08:16:46 +0000 Subject: [PATCH 1/2] Replaced dependency on server.js for mocha tests. --- test/mocha/article/model.js | 1 + test/mocha/user/model.js | 1 + 2 files changed, 2 insertions(+) diff --git a/test/mocha/article/model.js b/test/mocha/article/model.js index 9377f577..d348785c 100644 --- a/test/mocha/article/model.js +++ b/test/mocha/article/model.js @@ -4,6 +4,7 @@ * Module dependencies. */ var should = require('should'), + app = require('../../../server'), mongoose = require('mongoose'), User = mongoose.model('User'), Article = mongoose.model('Article'); diff --git a/test/mocha/user/model.js b/test/mocha/user/model.js index fada6580..3afa048a 100644 --- a/test/mocha/user/model.js +++ b/test/mocha/user/model.js @@ -4,6 +4,7 @@ * Module dependencies. */ var should = require('should'), + app = require('../../../server'), mongoose = require('mongoose'), User = mongoose.model('User'); From c639ae65c2a0e779a5b45500a47234f270bb890b Mon Sep 17 00:00:00 2001 From: Richard McIntyre Date: Wed, 18 Dec 2013 08:16:46 +0000 Subject: [PATCH 2/2] Require server in gruntfile for mocha tests. --- gruntfile.js | 3 ++- test/mocha/article/model.js | 1 - test/mocha/user/model.js | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index a85f100f..5e45d1b6 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -63,7 +63,8 @@ module.exports = function(grunt) { }, mochaTest: { options: { - reporter: 'spec' + reporter: 'spec', + require: 'server.js' }, src: ['test/mocha/**/*.js'] }, diff --git a/test/mocha/article/model.js b/test/mocha/article/model.js index d348785c..9377f577 100644 --- a/test/mocha/article/model.js +++ b/test/mocha/article/model.js @@ -4,7 +4,6 @@ * Module dependencies. */ var should = require('should'), - app = require('../../../server'), mongoose = require('mongoose'), User = mongoose.model('User'), Article = mongoose.model('Article'); diff --git a/test/mocha/user/model.js b/test/mocha/user/model.js index 3afa048a..fada6580 100644 --- a/test/mocha/user/model.js +++ b/test/mocha/user/model.js @@ -4,7 +4,6 @@ * Module dependencies. */ var should = require('should'), - app = require('../../../server'), mongoose = require('mongoose'), User = mongoose.model('User');