Merge pull request #136 from sethkinast/travis-update

Sync linkedin/dustjs#650

.travis.yml

@@ -1,25 +1,20 @@
 language: node_js
 node_js:
  - "0.12"
- - "0.10"
  - "iojs"
-env:
- - TEST="all"
- - TEST="node"
 matrix:
- exclude:
- - node_js: "iojs"
- env: TEST="all"
- - node_js: "0.12"
- env: TEST="all"
+ include:
  - node_js: "0.10"
- env: TEST="node"
+ env: TEST="all"
 notifications:
  email:
  - [email protected]
  - [email protected]
 before_install:
- - npm install -g grunt-cli
-script:
- - "[ $TEST = 'all' ] && grunt test || grunt testNode"
+ - npm install -g npm
+before_script:
+ - npm update
 sudo: false
+cache:
+ directories:
+ - node_modules

gruntfile.js → Gruntfile.js

@@ -233,10 +233,13 @@ module.exports = function (grunt) {
  grunt.registerTask('build', ['clean:build', 'jshint:testSpecs', 'buildLib', 'uglify:build']);
 
  //test tasks
- grunt.registerTask('testNode', ['build', 'shell:testNode']);
+ grunt.registerTask('testNode', ['shell:testNode']);
  grunt.registerTask('testRhino', ['build', 'shell:testRhino']);
  grunt.registerTask('testPhantom', ['build', 'jasmine:testProd']);
- grunt.registerTask('test', ['build', 'jasmine:testProd', 'shell:testNode', 'shell:testRhino', 'jasmine:coverage']);
+ grunt.registerTask('test', ['build', 'jasmine:testProd', 'testNode', 'shell:testRhino', 'jasmine:coverage']);
+
+ //decide whether to run all tests or just the Node tests for Travis CI
+ grunt.registerTask('travis', (process.env.TEST === 'all') ? ['test'] : ['testNode']);
 
  //task for debugging in browser
  grunt.registerTask('dev', ['build', 'jasmine:testDev:build', 'connect:testServer','log:testClient', 'watch:lib']);

package.json

@@ -22,7 +22,7 @@
  "Richard Ragan <[email protected]>"
  ],
  "scripts": {
- "test": "grunt test"
+ "test": "grunt travis"
  },
  "main": "./lib/dust-helpers",
  "repository": {
@@ -44,6 +44,7 @@
  "devDependencies": {
  "dustjs-linkedin": "2.7 - 2.8",
  "grunt": "~0.4.2",
+ "grunt-cli": "~0.1.13",
  "grunt-contrib-jshint": "~0.11.1",
  "grunt-contrib-jasmine": "~0.8.2",
  "grunt-template-jasmine-istanbul": "~0.3.3",