Remove hasDeprecationWarnings from watch function, move it up one…

… level.
jestjs · Apr 12, 2017 · 1f900d0 · 1f900d0
1 parent 60ff35f
commit 1f900d0
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 73 deletions.
diff --git a/packages/jest-cli/src/TestRunner.js b/packages/jest-cli/src/TestRunner.js
@@ -284,9 +284,11 @@ class TestRunner {
       this.addReporter(new CoverageReporter());
     }
 
-    this.addReporter(new SummaryReporter({
-      getTestSummary: this._options.getTestSummary,
-    }));
+    this.addReporter(
+      new SummaryReporter({
+        getTestSummary: this._options.getTestSummary,
+      }),
+    );
     if (config.notify) {
       this.addReporter(new NotifyReporter(this._startRun));
     }

diff --git a/packages/jest-cli/src/__tests__/watch-filename-pattern-mode-test.js b/packages/jest-cli/src/__tests__/watch-filename-pattern-mode-test.js
@@ -84,7 +84,6 @@ describe('Watch mode flows', () => {
   let argv;
   let context;
   let config;
-  let hasDeprecationWarnings;
   let stdin;
 
   beforeEach(() => {
@@ -94,13 +93,12 @@ describe('Watch mode flows', () => {
     argv = {};
     context = {};
     config = {};
-    hasDeprecationWarnings = false;
     stdin = new MockStdin();
   });
 
   it('Pressing "P" enters pattern mode', () => {
     config = {rootDir: ''};
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
 
     // Write a enter pattern mode
     stdin.emit(KEYS.P);
@@ -137,7 +135,7 @@ describe('Watch mode flows', () => {
 
   it('Results in pattern mode get truncated appropriately', () => {
     config = {rootDir: ''};
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
 
     stdin.emit(KEYS.P);
 

diff --git a/packages/jest-cli/src/__tests__/watch-test-name-pattern-mode-test.js b/packages/jest-cli/src/__tests__/watch-test-name-pattern-mode-test.js
@@ -108,7 +108,6 @@ describe('Watch mode flows', () => {
   let argv;
   let context;
   let config;
-  let hasDeprecationWarnings;
   let stdin;
 
   beforeEach(() => {
@@ -118,13 +117,12 @@ describe('Watch mode flows', () => {
     argv = {};
     context = {};
     config = {};
-    hasDeprecationWarnings = false;
     stdin = new MockStdin();
   });
 
   it('Pressing "T" enters pattern mode', () => {
     config = {rootDir: ''};
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
 
     // Write a enter pattern mode
     stdin.emit(KEYS.T);
@@ -161,7 +159,7 @@ describe('Watch mode flows', () => {
 
   it('Results in pattern mode get truncated appropriately', () => {
     config = {rootDir: ''};
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
 
     stdin.emit(KEYS.T);
 

diff --git a/packages/jest-cli/src/__tests__/watch-test.js b/packages/jest-cli/src/__tests__/watch-test.js
@@ -41,7 +41,6 @@ describe('Watch mode flows', () => {
   let argv;
   let context;
   let config;
-  let hasDeprecationWarnings;
   let stdin;
 
   beforeEach(() => {
@@ -50,15 +49,14 @@ describe('Watch mode flows', () => {
     argv = {};
     context = {};
     config = {roots: [], testPathIgnorePatterns: [], testRegex: ''};
-    hasDeprecationWarnings = false;
     stdin = new MockStdin();
   });
 
   it('Correctly passing test path pattern', () => {
     argv.testPathPattern = 'test-*';
     config.testPathPattern = 'test-*';
 
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
 
     expect(runJestMock).toBeCalledWith(
       [context],
@@ -74,7 +72,7 @@ describe('Watch mode flows', () => {
     argv.testNamePattern = 'test-*';
     config.testNamePattern = 'test-*';
 
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
 
     expect(runJestMock).toBeCalledWith(
       [context],
@@ -87,7 +85,7 @@ describe('Watch mode flows', () => {
   });
 
   it('Runs Jest once by default and shows usage', () => {
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
     expect(runJestMock).toBeCalledWith(
       [context],
       argv,
@@ -100,7 +98,7 @@ describe('Watch mode flows', () => {
   });
 
   it('Pressing "o" runs test in "only changed files" mode', () => {
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
     runJestMock.mockReset();
 
     stdin.emit(KEYS.O);
@@ -114,7 +112,7 @@ describe('Watch mode flows', () => {
   });
 
   it('Pressing "a" runs test in "watch all" mode', () => {
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
     runJestMock.mockReset();
 
     stdin.emit(KEYS.A);
@@ -128,14 +126,14 @@ describe('Watch mode flows', () => {
   });
 
   it('Pressing "ENTER" reruns the tests', () => {
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
     expect(runJestMock).toHaveBeenCalledTimes(1);
     stdin.emit(KEYS.ENTER);
     expect(runJestMock).toHaveBeenCalledTimes(2);
   });
 
   it('Pressing "u" reruns the tests in "update snapshot" mode', () => {
-    watch(config, pipe, argv, hasteMap, context, hasDeprecationWarnings, stdin);
+    watch(config, pipe, argv, hasteMap, context, stdin);
     runJestMock.mockReset();
 
     stdin.emit(KEYS.U);

diff --git a/packages/jest-cli/src/cli/runCLI.js b/packages/jest-cli/src/cli/runCLI.js
@@ -14,11 +14,12 @@ import type {Config, Path} from 'types/Config';
 
 const Runtime = require('jest-runtime');
 
-const chalk = require('chalk');
 const {Console, clearLine} = require('jest-util');
 const {createDirectory} = require('jest-util');
+const chalk = require('chalk');
 const createContext = require('../lib/createContext');
 const getMaxWorkers = require('../lib/getMaxWorkers');
+const handleDeprecationWarnings = require('../lib/handleDeprecationWarnings');
 const logDebugMessages = require('../lib/logDebugMessages');
 const preRunMessage = require('../preRunMessage');
 const readConfig = require('jest-config').readConfig;
@@ -53,7 +54,7 @@ module.exports = async (
     }
 
     if (argv.watch || argv.watchAll) {
-      const {config} = configs[0];
+      const {config, hasDeprecationWarnings} = configs[0];
       createDirectory(config.cacheDirectory);
       const hasteMapInstance = Runtime.createHasteMap(config, {
         console: new Console(pipe, pipe),
@@ -64,15 +65,16 @@ module.exports = async (
 
       const hasteMap = await hasteMapInstance.build();
       const context = createContext(config, hasteMap);
-      return watch(
-        config,
-        pipe,
-        argv,
-        hasteMapInstance,
-        context,
-        // TODO
-        configs[0].hasDeprecationWarnings,
-      );
+      if (hasDeprecationWarnings) {
+        try {
+          await handleDeprecationWarnings(pipe, process.stdin);
+          return watch(config, pipe, argv, hasteMapInstance, context);
+        } catch (e) {
+          process.exit(0);
+        }
+      }
+
+      return watch(config, pipe, argv, hasteMapInstance, context);
     } else {
       const contexts = await Promise.all(
         configs.map(async ({config}) => {

diff --git a/packages/jest-cli/src/lib/handleDeprecationWarnings.js b/packages/jest-cli/src/lib/handleDeprecationWarnings.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
+ */
+'use strict';
+
+const chalk = require('chalk');
+const {KEYS} = require('../constants');
+
+module.exports = (
+  pipe: stream$Writable | tty$WriteStream,
+  stdin: stream$Readable | tty$ReadStream = process.stdin,
+) => {
+  return new Promise((resolve, reject) => {
+    if (typeof stdin.setRawMode === 'function') {
+      const messages = [
+        chalk.red('There are deprecation warnings.\n'),
+        chalk.dim(' \u203A Press ') + 'Enter' + chalk.dim(' to continue.'),
+        chalk.dim(' \u203A Press ') + 'Esc' + chalk.dim(' to exit.'),
+      ];
+
+      pipe.write(messages.join('\n'));
+
+      // $FlowFixMe
+      stdin.setRawMode(true);
+      stdin.resume();
+      stdin.setEncoding('hex');
+      stdin.on('data', (key: string) => {
+        if (key === KEYS.ENTER) {
+          resolve();
+        } else if (
+          [KEYS.ESCAPE, KEYS.CONTROL_C, KEYS.CONTROL_D].indexOf(key) !== -1
+        ) {
+          reject();
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+};
diff --git a/packages/jest-cli/src/watch.js b/packages/jest-cli/src/watch.js
@@ -32,17 +32,8 @@ const watch = (
   argv: Object,
   hasteMap: HasteMap,
   context: Context,
-  hasDeprecationWarnings?: boolean,
   stdin?: stream$Readable | tty$ReadStream = process.stdin,
 ) => {
-  if (hasDeprecationWarnings) {
-    return handleDeprecatedWarnings(pipe, stdin)
-      .then(() => {
-        watch(config, pipe, argv, hasteMap, context);
-      })
-      .catch(() => process.exit(0));
-  }
-
   setState(argv, argv.watch ? 'watch' : 'watchAll', {
     testNamePattern: argv.testNamePattern,
     testPathPattern: argv.testPathPattern ||
@@ -225,39 +216,6 @@ const watch = (
   return Promise.resolve();
 };
 
-const handleDeprecatedWarnings = (
-  pipe: stream$Writable | tty$WriteStream,
-  stdin: stream$Readable | tty$ReadStream = process.stdin,
-) => {
-  return new Promise((resolve, reject) => {
-    if (typeof stdin.setRawMode === 'function') {
-      const messages = [
-        chalk.red('There are deprecation warnings.\n'),
-        chalk.dim(' \u203A Press ') + 'Enter' + chalk.dim(' to continue.'),
-        chalk.dim(' \u203A Press ') + 'Esc' + chalk.dim(' to exit.'),
-      ];
-
-      pipe.write(messages.join('\n'));
-
-      // $FlowFixMe
-      stdin.setRawMode(true);
-      stdin.resume();
-      stdin.setEncoding('hex');
-      stdin.on('data', (key: string) => {
-        if (key === KEYS.ENTER) {
-          resolve();
-        } else if (
-          [KEYS.ESCAPE, KEYS.CONTROL_C, KEYS.CONTROL_D].indexOf(key) !== -1
-        ) {
-          reject();
-        }
-      });
-    } else {
-      resolve();
-    }
-  });
-};
-
 const usage = (argv, snapshotFailure, delimiter = '\n') => {
   /* eslint-disable max-len */
   const messages = [