@@ -111,29 +111,26 @@ gulp.task('less', function () {
111
111
. pipe ( gulp . dest ( './modules/' ) ) ;
112
112
} ) ;
113
113
114
- // Connect to MongoDB using the mongoose module
115
- gulp . task ( 'openMongoose' , function ( done ) {
114
+ // Mocha tests task
115
+ gulp . task ( 'mocha' , function ( done ) {
116
+ // Open mongoose connections
116
117
var mongoose = require ( './config/lib/mongoose.js' ) ;
117
118
119
+ var error ;
118
120
mongoose . connect ( function ( ) {
119
- done ( ) ;
121
+ gulp . src ( testAssets . tests . server )
122
+ . pipe ( plugins . mocha ( {
123
+ reporter : 'spec'
124
+ } ) )
125
+ . on ( 'error' , function ( err ) {
126
+ error = new Error ( 'Mocha tests failed' ) ;
127
+ } ) . on ( 'end' , function ( ) {
128
+ mongoose . disconnect ( function ( ) {
129
+ done ( error ) ;
130
+ } ) ;
131
+ } ) ;
120
132
} ) ;
121
- } ) ;
122
-
123
- gulp . task ( 'closeMongoose' , function ( done ) {
124
- var mongoose = require ( './config/lib/mongoose.js' ) ;
125
133
126
- mongoose . disconnect ( function ( err ) {
127
- done ( err ) ;
128
- } ) ;
129
- } ) ;
130
-
131
- // Mocha tests task
132
- gulp . task ( 'mocha' , function ( ) {
133
- return gulp . src ( testAssets . tests . server )
134
- . pipe ( plugins . mocha ( {
135
- reporter : 'spec'
136
- } ) ) ;
137
134
} ) ;
138
135
139
136
// Karma test runner task
@@ -143,11 +140,7 @@ gulp.task('karma', function (done) {
143
140
configFile : 'karma.conf.js' ,
144
141
action : 'run' ,
145
142
singleRun : true
146
- } ) )
147
- . on ( 'error' , function ( err ) {
148
- // Make sure failed tests cause gulp to exit non-zero
149
- throw err ;
150
- } ) ;
143
+ } ) ) ;
151
144
} ) ;
152
145
153
146
// Selenium standalone WebDriver update task
@@ -176,7 +169,7 @@ gulp.task('build', function(done) {
176
169
177
170
// Run the project tests
178
171
gulp . task ( 'test' , function ( done ) {
179
- runSequence ( 'env:test' , 'openMongoose' , [ 'karma' , 'mocha' ] , 'closeMongoose' , done ) ;
172
+ runSequence ( 'env:test' , [ 'karma' , 'mocha' ] , done ) ;
180
173
} ) ;
181
174
182
175
// Run the project in development mode
0 commit comments