Skip to content

Commit 900ae72

Browse files
authored
Merge pull request #77 from FullstackAcademy/gulp-spawn-mocha
Fix gulp-mocha not exiting task
2 parents 7e06e56 + 7931507 commit 900ae72

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

generated/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var ngAnnotate = require('gulp-ng-annotate');
1212
var uglify = require('gulp-uglify');
1313
var sourcemaps = require('gulp-sourcemaps');
1414
var eslint = require('gulp-eslint');
15-
var mocha = require('gulp-mocha');
15+
var mocha = require('gulp-spawn-mocha');
1616
var karma = require('karma').server;
1717
var istanbul = require('gulp-istanbul');
1818
var notify = require('gulp-notify');

generated/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,23 @@
3636
"gulp-istanbul": "^0.9.0",
3737
"gulp-livereload": "^3.7.0",
3838
"gulp-minify-css": "^0.4.6",
39-
"gulp-mocha": "^2.0.0",
4039
"gulp-ng-annotate": "^0.5.2",
4140
"gulp-notify": "^2.2.0",
4241
"gulp-plumber": "^0.6.6",
4342
"gulp-rename": "^1.2.0",
4443
"gulp-sass": "^2.0.4",
4544
"gulp-sourcemaps": "^1.3.0",
45+
"gulp-spawn-mocha": "^3.1.0",
4646
"gulp-uglify": "^1.1.0",
47+
"istanbul": "^0.4.5",
4748
"karma": "^0.13.14",
4849
"karma-chai": "^0.1.0",
4950
"karma-chrome-launcher": "0.2.3",
5051
"karma-coverage": "^0.2.7",
5152
"karma-mocha": "^0.1.10",
5253
"karma-mocha-reporter": "^1.0.2",
5354
"lodash": "^3.9.3",
55+
"mocha": "^3.0.2",
5456
"nodemon": "^1.3.7",
5557
"passport": "^0.2.1",
5658
"passport-facebook": "^1.0.3",

generated/tests/server/routes/members-only-test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ describe('Members Route', function () {
4545
password: 'shoopdawoop'
4646
};
4747

48-
beforeEach('Create a user', function (done) {
49-
return User.create(userInfo).then(function (user) {
50-
done();
51-
}).catch(done);
48+
beforeEach('Create a user', function () {
49+
return User.create(userInfo);
5250
});
5351

5452
beforeEach('Create loggedIn user agent and authenticate', function (done) {

0 commit comments

Comments
 (0)