Skip to content

Use iojs + newer jest #4326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zpao wants to merge 1 commit into from
+9 −6
Closed

Use iojs + newer jest #4326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- '0.10'
- 'iojs'
sudo: false
cache:
directories:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion jest/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__DEV__ = true;
// var __DEV__ = true;
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -99,6 +99,9 @@
],
"unmockedModulePathPatterns": [
""
]
],
"globals": {
"__DEV__": true
}
}
}