Pin [email protected] for grunt-jasmine-nodejs

.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

@@ -301,8 +301,11 @@ module.exports = function(grunt) {
  grunt.registerTask('testNode', ['jasmine_nodejs:cjs', 'shell:oldTests']);
  grunt.registerTask('testRhino', ['build', 'shell:testRhino']);
  grunt.registerTask('testPhantom', ['build', 'jasmine:testProd']);
- grunt.registerTask('testCli', ['build', 'jasmine_nodejs:dustc']);
- grunt.registerTask('test', ['build', 'jasmine:testProd', 'jasmine_nodejs:dustc', 'jasmine_nodejs:cjs', 'shell:oldTests', 'shell:testRhino', 'jasmine:coverage']);
+ grunt.registerTask('testCli', ['jasmine_nodejs:dustc']);
+ grunt.registerTask('test', ['build', 'jasmine:testProd', 'testCli', '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', 'testCli']);
 
  //task for debugging in browser
  grunt.registerTask('dev', ['build', 'jasmine:testDev:build', 'connect:testServer','log:testClient', 'watch:lib']);

package.json

@@ -19,7 +19,7 @@
  "Richard Ragan <[email protected]>"
  ],
  "scripts": {
- "test": "grunt test"
+ "test": "grunt travis"
  },
  "bin": {
  "dustc": "./bin/dustc"
@@ -39,13 +39,14 @@
  "linkedin"
  ],
  "dependencies": {
- "chokidar": "~1.0.0",
- "cli": "~0.6.5"
+ "chokidar": "~1.0.1",
+ "cli": "~0.6.6"
  },
  "devDependencies": {
  "ayepromise": "~1.1.1",
  "grunt": "~0.4.2",
  "grunt-bump": "0.3.0",
+ "grunt-cli": "~0.1.13",
  "grunt-contrib-clean": "~0.6.0",
  "grunt-contrib-concat": "~0.5.1",
  "grunt-contrib-connect": "~0.9.0",
@@ -60,7 +61,9 @@
  "grunt-shell": "~1.1.2",
  "grunt-template-jasmine-istanbul": "~0.3.3",
  "highland": "2.4.0",
- "pegjs": "0.8.0"
+ "jasmine": "~2.2.1",
+ "pegjs": "0.8.0",
+ "tmp": "0.0.25"
  },
  "license": "MIT",
  "engine": {

test/jasmine-test/spec/cli/cliSpec.js

@@ -5,7 +5,7 @@ var path = require('path'),
 
 var ROOT_DIR = path.resolve(__dirname, '../../../../'),
  BIN_DIR = path.join(ROOT_DIR, 'bin'),
- TMP_DIR = path.join(ROOT_DIR, 'tmp'),
+ TMP_DIR = require('tmp').dirSync().name,
  FIXTURE_DIR = path.join(__dirname, 'fixtures');
 
 var packageJson = require(path.join(ROOT_DIR, 'package.json'));
@@ -65,7 +65,7 @@ describe('--name', function() {
 describe('--whitespace', function() {
  it('sets dust.config.whitespace to true', function(done) {
  dustc('a.dust --whitespace', function(err, stdout, stderr) {
- expect(stdout).toMatch(/(\\r?\\n){4}/);
+ expect(stdout).toMatch(/((\\r)?\\n){4}/);
  done();
  });
  });