Skip to content

Commit

Permalink
Merge ed90a03 into a119d21
Browse files Browse the repository at this point in the history
  • Loading branch information
PK1A committed Aug 14, 2014
2 parents a119d21 + ed90a03 commit 644730c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,10 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('atpackager');
require('atpackager').loadNpmPlugin('noder-js');

grunt.registerTask('prepublish', ['package']);
grunt.registerTask('package', ['peg', 'browserify', 'atpackager:uglify','atpackager:runtime','uglify']);
grunt.registerTask('mocha', ['peg', 'inittests', 'mochaTest', 'finalizetests']);
grunt.registerTask('test', ['checkStyle', 'jscs', 'mocha', 'karma:unit']);
grunt.registerTask('ci', ['checkStyle', 'jscs', 'mocha', 'karma:ci1', 'karma:ci2', 'karma:coverage']);
grunt.registerTask('ci', ['checkStyle', 'jscs', 'mocha', 'karma:ci1', 'karma:ci2', 'package', 'karma:coverage']);
grunt.registerTask('release', ['docs:release']);
grunt.registerTask('tddrt', ['hspserver','watch']);
grunt.registerTask('default', ['docs:playground']);
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"js-yaml": "~2.0.5"
},
"scripts": {
"test": "grunt test",
"prepublish": "grunt prepublish"
"test": "grunt test"
}
}

0 comments on commit 644730c

Please sign in to comment.