Skip to content

Commit

Permalink
Merge 83616e1 into da9b47e
Browse files Browse the repository at this point in the history
  • Loading branch information
brettlangdon committed Oct 27, 2015
2 parents da9b47e + 83616e1 commit f3a2be7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
# Use new container based infrastructure
# http://docs.travis-ci.com/user/migrating-from-legacy/
sudo: false
language: node_js
node_js:
- 'stable'
- '4.1'
- '4.0'
- '0.12'
- '0.11'
- '0.10'
- 'iojs'
after_script:
- jscoverage --no-highlight lib lib-cov
- JSFMT_COV=1 mocha -R mocha-lcov-reporter -r jscoverage --covinject=true ./tests | coveralls
6 changes: 4 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ module.exports = function(grunt) {
jsfmtLib: './bin/jsfmt -w ./lib/**/*.js',
jsfmtTests: './bin/jsfmt -w ./tests/**/*.js',
jsfmtGrunt: './bin/jsfmt -w ./Gruntfile.js',
jsfmtStyleGuide: './bin/jsfmt -w ./examples/styleGuide.js',
jsfmtExamples: './bin/jsfmt -w ./examples/**/*.js',
verifyNoChanges: 'git --no-pager diff && test "$(git diff)" == ""',
},
});

grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-mocha-test');
grunt.registerTask('default', ['jshint', 'mochaTest']);
grunt.registerTask('fmt', ['exec']);
grunt.registerTask('fmt', ['exec:jsfmtLib', 'exec:jsfmtTests', 'exec:jsfmtGrunt', 'exec:jsfmtExamples']);
grunt.registerTask('verify', ['exec:verifyNoChanges']);
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"jsfmt": "./bin/jsfmt"
},
"scripts": {
"test": "grunt"
"test": "grunt && grunt fmt && grunt verify",
"fmt": "grunt fmt"
},
"files": [
"bin",
Expand Down

0 comments on commit f3a2be7

Please sign in to comment.