Skip to content

Commit

Permalink
Merge pull request #146 from Riobe/master
Browse files Browse the repository at this point in the history
Make windows use node to run javascript files.
  • Loading branch information
krampstudio committed Sep 26, 2015
2 parents 2a05543 + 3258a94 commit 5b36463
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ module.exports = function(grunt) {
//testing tasks
grunt.registerTask('default', 'Default tas will lint and test', ['jshint', 'test']);
grunt.registerTask('test-basic', 'Test basic jsdoc', ['jsdoc:basic', 'nodeunit:basic']);
grunt.registerTask('test-basic', 'Test jsdoc with alternate options', ['jsdoc:alternate', 'nodeunit:alternate']);
grunt.registerTask('test-alternate', 'Test jsdoc with alternate options', ['jsdoc:alternate', 'nodeunit:alternate']);
grunt.registerTask('test-docstrap', 'Test jsdoc with a template', ['jsdoc:docstrap', 'nodeunit:docstrap']);
grunt.registerTask('test-spacepack', 'Test jsdoc with a package and spaces in the paths', ['jsdoc:spacepack', 'nodeunit:spacepack']);
grunt.registerTask('test', 'Full test suite', ['clean', 'nodeunit:unit', 'test-basic', 'test-docstrap', 'test-spacepack']);
grunt.registerTask('test', 'Full test suite', ['clean', 'nodeunit:unit', 'test-basic', 'test-alternate', 'test-docstrap', 'test-spacepack']);

};

2 changes: 1 addition & 1 deletion tasks/lib/exec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {

var flag;
var cmd = (isWin) ? 'cmd' : script;
var args = (isWin) ? ['/c', script] : [];
var args = (isWin) ? ['/c', script.slice(-2) === 'js' ? 'node ' + script : script] : [];


// handle paths that contain spaces
Expand Down

0 comments on commit 5b36463

Please sign in to comment.