diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index 13ae208..5f42b4d 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -434,15 +434,22 @@ module.exports = function (grunt) { } }, jasmine_node: { - specNameMatcher: './*.spec', // load only specs containing specNameMatcher - projectRoot: 'test/server', - requirejs: false, - forceExit: true, - jUnit: { - report: true, - savePath: './.reports/test/server/', - useDotNotation: true, - consolidate: true + options: { + specNameMatcher: 'spec', // load only specs containing specNameMatcher + requirejs: false, + forceExit: true + }, + test: ['test/server/'], + ci: { + options: { + jUnit: { + report: true, + savePath: '.reports/test/server/', + useDotNotation: true, + consolidate: true + } + }, + src: ['test/server/'] } }, bgShell: { @@ -626,7 +633,7 @@ module.exports = function (grunt) { 'clean:test', 'newer:jshint:test', 'karma:unit', - 'jasmine_node' + 'jasmine_node:test' ]); // client tests @@ -640,7 +647,7 @@ module.exports = function (grunt) { grunt.registerTask('test:server', [ 'clean:test', 'newer:jshint:test_server', - 'jasmine_node' + 'jasmine_node:test' ]); // coverage all @@ -678,7 +685,7 @@ module.exports = function (grunt) { 'clean:jshint', 'jshint:jslint', 'jshint:checkstyle', - 'jasmine_node', + 'jasmine_node:ci', 'bgShell:coverage', 'bgShell:cobertura', 'karma:ci', diff --git a/app/templates/_package.json b/app/templates/_package.json index 0fbe1e3..f7baa29 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -48,7 +48,7 @@ "grunt-contrib-uglify": "~0.2.0", "grunt-contrib-watch": "~0.5.2", "grunt-express-server": "~0.4.5", - "grunt-jasmine-node": "~0.1.0", + "grunt-jasmine-node": "^0.2.1", "grunt-karma": "~0.8.0", "grunt-newer": "~0.5.4", "grunt-ngmin": "~0.0.2",