Merge remote-tracking branch 'origin/master' into map-coverage

# Conflicts:
#	packages/jest-cli/package.json

packages/jest-editor-support/src/__tests__/parsers/parserTests.js → fixtures/parserTests.js

@@ -8,12 +8,9 @@
 
 'use strict';
 
-import type {ParserReturn} from '../../ScriptParser';
+const fixtures = __dirname;
 
-const path = require('path');
-const fixtures = path.resolve(__dirname, '../fixtures');
-
-function parserTests(parse: (file: string) => ParserReturn) {
+function parserTests(parse: (file: string) => any) {
   describe('File parsing without throwing', () => {
     it('Should not throw', () => {
       expect(() => {

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0-beta.37",
-  "version": "19.0.1",
+  "version": "19.0.2",
   "linkedFiles": {
     "prefix": "/**\n * @flow\n */\n"
   },

packages/babel-jest/src/index.js

@@ -64,7 +64,8 @@ const createTransformer = (options: any) => {
       configString: string,
       {instrument, watch}: TransformOptions,
     ): string {
-      return crypto.createHash('md5')
+      return crypto
+        .createHash('md5')
         .update(THIS_FILE)
         .update('\0', 'utf8')
         .update(fileData)

packages/jest-changed-files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-changed-files",
-  "version": "19.0.0",
+  "version": "19.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git"

packages/jest-changed-files/src/__tests__/git-test.js

@@ -11,6 +11,7 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 const rimraf = require('rimraf');
+const mkdirp = require('mkdirp');
 const childProcess = require('child_process');
 
 const tmpdir = path.resolve(os.tmpdir(), 'jest-changed-files-git');
@@ -26,7 +27,7 @@ describe('git', () => {
 
   beforeEach(() => {
     git = require('../git');
-    childProcess.spawnSync('mkdir', ['-p', tmpdirNested]);
+    mkdirp.sync(tmpdirNested);
   });
 
   afterEach(() => rimraf.sync(tmpdir));

packages/jest-changed-files/src/__tests__/hg-test.js

@@ -11,6 +11,7 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 const rimraf = require('rimraf');
+const mkdirp = require('mkdirp');
 const childProcess = require('child_process');
 
 const tmpdir = path.resolve(os.tmpdir(), 'jest-changed-files-hg');
@@ -28,7 +29,7 @@ describe('hg', () => {
     jest.resetModules();
 
     hg = require('../hg');
-    childProcess.spawnSync('mkdir', ['-p', tmpdirNested]);
+    mkdirp.sync(tmpdirNested);
   });
 
   afterEach(() => rimraf.sync(tmpdir));

packages/jest-changed-files/src/git.js

@@ -25,9 +25,9 @@ function findChangedFiles(
   options?: Options,
 ): Promise<Array<Path>> {
   return new Promise((resolve, reject) => {
-    const args = (options && options.lastCommit)
-       ? ['show', '--name-only', '--pretty=%b', 'HEAD']
-       : ['ls-files', '--other', '--modified', '--exclude-standard'];
+    const args = options && options.lastCommit
+      ? ['show', '--name-only', '--pretty=%b', 'HEAD']
+      : ['ls-files', '--other', '--modified', '--exclude-standard'];
     const child = childProcess.spawn('git', args, {cwd});
     let stdout = '';
     let stderr = '';
@@ -40,9 +40,11 @@ function findChangedFiles(
         if (stdout === '') {
           resolve([]);
         } else {
-          resolve(stdout.split('\n').map(
-            changedPath => path.resolve(cwd, changedPath),
-          ));
+          resolve(
+            stdout
+              .split('\n')
+              .map(changedPath => path.resolve(cwd, changedPath)),
+          );
         }
       } else {
         reject(code + ': ' + stderr);

packages/jest-changed-files/src/hg.js

@@ -44,9 +44,11 @@ function findChangedFiles(cwd: string, options: Options): Promise<Array<Path>> {
         if (stdout === '') {
           resolve([]);
         } else {
-          resolve(stdout.split('\n').map(
-            changedPath => path.resolve(cwd, changedPath),
-          ));
+          resolve(
+            stdout
+              .split('\n')
+              .map(changedPath => path.resolve(cwd, changedPath)),
+          );
         }
       } else {
         reject(code + ': ' + stderr);

packages/jest-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jest-cli",
   "description": "Painless JavaScript Testing.",
-  "version": "19.0.1",
+  "version": "19.0.2",
   "main": "build/jest.js",
   "dependencies": {
     "ansi-escapes": "^1.4.0",
@@ -13,17 +13,17 @@
     "istanbul-lib-coverage": "^1.0.0",
     "istanbul-lib-instrument": "^1.1.1",
     "istanbul-lib-source-maps": "^1.1.0",
-    "jest-changed-files": "^19.0.0",
-    "jest-config": "^19.0.1",
-    "jest-environment-jsdom": "^19.0.1",
+    "jest-changed-files": "^19.0.2",
+    "jest-config": "^19.0.2",
+    "jest-environment-jsdom": "^19.0.2",
     "jest-haste-map": "^19.0.0",
-    "jest-jasmine2": "^19.0.1",
+    "jest-jasmine2": "^19.0.2",
     "jest-message-util": "^19.0.0",
     "jest-regex-util": "^19.0.0",
     "jest-resolve-dependencies": "^19.0.0",
-    "jest-runtime": "^19.0.1",
-    "jest-snapshot": "^19.0.1",
-    "jest-util": "^19.0.1",
+    "jest-runtime": "^19.0.2",
+    "jest-snapshot": "^19.0.2",
+    "jest-util": "^19.0.2",
     "node-notifier": "^5.0.1",
     "micromatch": "^2.3.11",
     "slash": "^1.0.0",

packages/jest-cli/src/TestNamePatternPrompt.js

@@ -40,37 +40,25 @@ module.exports = (
     _cachedTestResults;
 
     constructor() {
-      (this:any).onChange = this.onChange.bind(this);
+      (this: any).onChange = this.onChange.bind(this);
     }
 
-    run(
-      onSuccess: Function,
-      onCancel: Function,
-    ) {
+    run(onSuccess: Function, onCancel: Function) {
       pipe.write(ansiEscapes.cursorHide);
       pipe.write(ansiEscapes.clearScreen);
       pipe.write(usage());
       pipe.write(ansiEscapes.cursorShow);
 
-      prompt.enter(
-        this.onChange,
-        onSuccess,
-        onCancel,
-      );
+      prompt.enter(this.onChange, onSuccess, onCancel);
     }
 
-    onChange(
-      pattern: string,
-    ) {
+    onChange(pattern: string) {
       pipe.write(ansiEscapes.eraseLine);
       pipe.write(ansiEscapes.cursorLeft);
       this.printTypeahead(pattern, 10);
     }
 
-    printTypeahead(
-      pattern: string,
-      max: number,
-    ) {
+    printTypeahead(pattern: string, max: number) {
       const matchedTests = this.getMatchedTests(pattern);
 
       const total = matchedTests.length;

packages/jest-cli/src/TestPathPatternPrompt.js

@@ -42,47 +42,35 @@ module.exports = (
     searchSource: SearchSource;
 
     constructor() {
-      (this:any).onChange = this.onChange.bind(this);
+      (this: any).onChange = this.onChange.bind(this);
     }
 
-    run(
-      onSuccess: Function,
-      onCancel: Function,
-    ) {
+    run(onSuccess: Function, onCancel: Function) {
       pipe.write(ansiEscapes.cursorHide);
       pipe.write(ansiEscapes.clearScreen);
       pipe.write(usage());
       pipe.write(ansiEscapes.cursorShow);
 
-      prompt.enter(
-        this.onChange,
-        onSuccess,
-        onCancel,
-      );
+      prompt.enter(this.onChange, onSuccess, onCancel);
     }
 
-    onChange(
-      pattern: string,
-    ) {
+    onChange(pattern: string) {
       let regex;
 
       try {
         regex = new RegExp(pattern, 'i');
       } catch (e) {}
 
-      const paths = regex ?
-        this.searchSource.findMatchingTests(pattern).paths : [];
+      const paths = regex
+        ? this.searchSource.findMatchingTests(pattern).paths
+        : [];
 
       pipe.write(ansiEscapes.eraseLine);
       pipe.write(ansiEscapes.cursorLeft);
       this.printTypeahead(pattern, paths, 10);
     }
 
-    printTypeahead(
-      pattern: string,
-      allResults: Array<Path>,
-      max: number,
-    ) {
+    printTypeahead(pattern: string, allResults: Array<Path>, max: number) {
       const total = allResults.length;
       const results = allResults.slice(0, max);
       const inputText = `${chalk.dim(' pattern \u203A')} ${pattern}`;
@@ -107,9 +95,8 @@ module.exports = (
             const filePath = trimAndFormatPath(padding, config, rawPath, width);
             return highlight(rawPath, filePath, pattern, config.rootDir);
           })
-          .forEach(
-            filePath => pipe.write(`\n  ${chalk.dim('\u203A')} ${filePath}`)
-          );
+          .forEach(filePath =>
+            pipe.write(`\n  ${chalk.dim('\u203A')} ${filePath}`));
 
         if (total > max) {
           const more = total - max;
@@ -127,9 +114,7 @@ module.exports = (
       pipe.write(ansiEscapes.cursorRestorePosition);
     }
 
-    updateSearchSource(
-      hasteContext: HasteContext,
-    ) {
+    updateSearchSource(hasteContext: HasteContext) {
       this.searchSource = new SearchSource(hasteContext, config);
     }
   }

packages/jest-cli/src/TestRunner.js

@@ -49,15 +49,9 @@ type Options = {|
   getTestSummary: () => string,
 |};
 
-type OnRunFailure = (
-  path: string,
-  err: TestError,
-) => void;
+type OnRunFailure = (path: string, err: TestError) => void;
 
-type OnTestResult = (
-  path: string,
-  result: TestResult,
-) => void;
+type OnTestResult = (path: string, result: TestResult) => void;
 
 const TEST_WORKER_PATH = require.resolve('./TestWorker');
 
@@ -73,7 +67,7 @@ class TestRunner {
     hasteContext: HasteContext,
     config: Config,
     options: Options,
-    startRun: () => *
+    startRun: () => *,
   ) {
     this._config = config;
     this._dispatcher = new ReporterDispatcher(
@@ -132,7 +126,7 @@ class TestRunner {
       stats[filePath] || (stats[filePath] = fs.statSync(filePath).size);
     const getTestRunTime = filePath => {
       if (cache[filePath]) {
-        return (cache[filePath][0] === FAIL) ? Infinity : cache[filePath][1];
+        return cache[filePath][0] === FAIL ? Infinity : cache[filePath][1];
       }
       return null;
     };
@@ -164,7 +158,7 @@ class TestRunner {
         const perf = test.perfStats;
         cache[test.testFilePath] = [
           test.numFailingTests ? FAIL : SUCCESS,
-          (perf.end - perf.start) || 0,
+          perf.end - perf.start || 0,
         ];
       }
     });
@@ -582,8 +576,7 @@ class ReporterDispatcher {
 
   onRunComplete(config, results) {
     this._reporters.forEach(reporter =>
-      reporter.onRunComplete(config, results, this._runnerContext),
-    );
+      reporter.onRunComplete(config, results, this._runnerContext));
   }
 
   // Return a list of last errors for every reporter
@@ -612,10 +605,7 @@ const getEstimatedTime = (timings, workers) => {
     return max;
   }
 
-  return Math.max(
-    timings.reduce((sum, time) => sum + time) / workers,
-    max,
-  );
+  return Math.max(timings.reduce((sum, time) => sum + time) / workers, max);
 };
 
 module.exports = TestRunner;

packages/jest-cli/src/TestWatcher.js

@@ -37,7 +37,6 @@ class TestWatcher extends EventEmitter {
   isWatchMode() {
     return this._isWatchMode;
   }
-
 }
 
 module.exports = TestWatcher;

packages/jest-cli/src/TestWorker.js

@@ -33,7 +33,7 @@ type WorkerData = {|
 
 type WorkerCallback = (error: ?SerializableError, result?: TestResult) => void;
 
-const formatError = (error: string|Error): SerializableError => {
+const formatError = (error: string | Error): SerializableError => {
   if (typeof error === 'string') {
     const {message, stack} = separateMessageFromStack(error);
     return {

packages/jest-cli/src/runJest.js

@@ -25,10 +25,7 @@ const getMaxWorkers = require('./lib/getMaxWorkers');
 const path = require('path');
 const setState = require('./lib/setState');
 
-const getTestSummary = (
-  argv: Object,
-  patternInfo: PatternInfo,
-) => {
+const getTestSummary = (argv: Object, patternInfo: PatternInfo) => {
   const testPathPattern = SearchSource.getTestPathPattern(patternInfo);
   const testInfo = patternInfo.onlyChanged
     ? chalk.dim(' related to changed files')
@@ -101,7 +98,7 @@ const runJest = (
             getTestSummary: () => getTestSummary(argv, patternInfo),
             maxWorkers,
           },
-          startRun
+          startRun,
         ).runTests(data.paths, testWatcher);
       })
       .then(runResults => {

packages/jest-cli/src/watch.js

@@ -26,7 +26,6 @@ const TestPathPatternPrompt = require('./TestPathPatternPrompt');
 const TestNamePatternPrompt = require('./TestNamePatternPrompt');
 const {KEYS, CLEAR} = require('./constants');
 
-
 const watch = (
   config: Config,
   pipe: stream$Writable | tty$WriteStream,