From 2afc9a445fc2d23a13c6e5545dc6db8d10fc8115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 18 Aug 2015 23:40:32 -0700 Subject: [PATCH] Upgrade to node@4, jest@0.5 --- .travis.yml | 3 ++- package.json | 4 ++-- scripts/jest/environment.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 814850ee9b..007320ce56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: -- '0.10' +- 4 sudo: false cache: directories: @@ -16,6 +16,7 @@ before_install: exit fi npm install -g npm@latest-2 + npm --version script: - | if [ "$TEST_TYPE" = build_website ]; then diff --git a/package.json b/package.json index e5f6b1de46..ce726d0b58 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "gulp-flatten": "^0.1.0", "gulp-util": "^3.0.5", "gzip-js": "~0.3.2", - "jest-cli": "^0.4.13", + "jest-cli": "^0.5.7", "jstransform": "^11.0.0", "object-assign": "^3.0.0", "optimist": "^0.6.1", @@ -40,7 +40,7 @@ "uglifyify": "^3.0.1" }, "devEngines": { - "node": "0.10.x", + "node": "4.x", "npm": "2.x" }, "commonerConfig": { diff --git a/scripts/jest/environment.js b/scripts/jest/environment.js index fbcfe98d56..edc810072c 100644 --- a/scripts/jest/environment.js +++ b/scripts/jest/environment.js @@ -1,2 +1,2 @@ /* eslint-disable */ -__DEV__ = true; +global.__DEV__ = true;