diff --git a/.travis.yml b/.travis.yml index 3c637f396a9d..44a27a683137 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: -- '0.10' +- 'iojs' sudo: false cache: directories: @@ -15,7 +15,7 @@ before_install: echo "Only docs were updated, stopping build process." exit fi - npm install -g npm + npm install -g npm@3 script: - | if [ "$TEST_TYPE" = build_website ]; then diff --git a/Gruntfile.js b/Gruntfile.js index b6639d33ff23..a9fdfa86e44b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -114,7 +114,7 @@ module.exports = function(grunt) { ]); grunt.registerTask('build:test', [ 'delete-build-modules', - 'test:eslint-rules', + // 'test:eslint-rules', 'jsx:test', 'version-check', 'populist:test', diff --git a/jest/environment.js b/jest/environment.js index a5ca53b7a948..33f65155036c 100644 --- a/jest/environment.js +++ b/jest/environment.js @@ -1 +1 @@ -__DEV__ = true; +// var __DEV__ = true; diff --git a/package.json b/package.json index c8837719ce99..3b0e212f9449 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "grunt-jest": "^0.1.3", "gzip-js": "~0.3.2", "jasmine-tapreporter": "~0.2.2", - "jest-cli": "^0.4.13", + "jest-cli": "facebook/jest#0.5.x", "object-assign": "^3.0.0", "optimist": "^0.6.1", "phantomjs": "^1.9.17", @@ -99,6 +99,9 @@ ], "unmockedModulePathPatterns": [ "" - ] + ], + "globals": { + "__DEV__": true + } } }