Skip to content

Commit

Permalink
Updated react-scripts babel-jest && jest packages to 18.0.0 (#1311)
Browse files Browse the repository at this point in the history
  • Loading branch information
lopezator authored and gaearon committed Dec 23, 2016
1 parent 7d66ba1 commit ac6a4c8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
4 changes: 2 additions & 2 deletions packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"autoprefixer": "6.5.1",
"babel-core": "6.17.0",
"babel-eslint": "7.1.1",
"babel-jest": "17.0.2",
"babel-jest": "18.0.0",
"babel-loader": "6.2.7",
"babel-preset-react-app": "^2.0.1",
"case-sensitive-paths-webpack-plugin": "1.1.4",
Expand All @@ -50,7 +50,7 @@
"gzip-size": "3.0.0",
"html-webpack-plugin": "2.24.0",
"http-proxy-middleware": "0.17.2",
"jest": "17.0.2",
"jest": "18.0.0",
"json-loader": "0.5.4",
"object-assign": "4.1.0",
"postcss-loader": "1.0.0",
Expand Down
12 changes: 0 additions & 12 deletions packages/react-scripts/scripts/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ if (!process.env.CI && argv.indexOf('--coverage') < 0) {
argv.push('--watch');
}

// A temporary hack to clear terminal correctly.
// You can remove this after updating to Jest 18 when it's out.
// https://github.com/facebook/jest/pull/2230
var realWrite = process.stdout.write;
var CLEAR = process.platform === 'win32' ? '\x1Bc' : '\x1B[2J\x1B[3J\x1B[H';
process.stdout.write = function(chunk, encoding, callback) {
if (chunk === '\x1B[2J\x1B[H') {
chunk = CLEAR;
}
return realWrite.call(this, chunk, encoding, callback);
};

// @remove-on-eject-begin
// This is not necessary after eject because we embed config into package.json.
const createJestConfig = require('../utils/createJestConfig');
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/utils/createJestConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
setupFiles: [resolve('config/polyfills.js')],
setupTestFrameworkScriptFile: setupTestsFile,
testPathIgnorePatterns: [
'<rootDir>[/\\\\](build|docs|node_modules)[/\\\\]'
'<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]'
],
testEnvironment: 'node',
testURL: 'http://localhost',
Expand Down

0 comments on commit ac6a4c8

Please sign in to comment.