Use quit as a plugin

packages/jest-cli/src/__tests__/__snapshots__/watch.test.js.snap

@@ -14,8 +14,8 @@ Watch Usage
  › Press a to run all tests.
  › Press f to run only failed tests.
  › Press p to filter by a filename regex pattern.
- › Press t to filter by a test regex pattern.
  › Press q to quit watch mode.
+ › Press t to filter by a test regex pattern.
  › Press Enter to trigger a test run.
 ",
 ]
@@ -29,10 +29,10 @@ Watch Usage
  › Press a to run all tests.
  › Press f to run only failed tests.
  › Press p to filter by a filename regex pattern.
+ › Press q to quit watch mode.
  › Press s to do nothing.
  › Press t to filter by a test regex pattern.
  › Press u to do something else.
- › Press q to quit watch mode.
  › Press Enter to trigger a test run.
 ",
   ],

packages/jest-cli/src/lib/watch_plugin_registry.js

@@ -12,7 +12,6 @@ import getType from 'jest-get-type';
 
 const RESERVED_KEYS = [
   0x03, // Jest should handle ctrl-c interrupt
-  'q'.codePointAt(0), // 'q' is reserved for quit
 ];
 
 export default class WatchPluginRegistry {

packages/jest-cli/src/plugins/quit.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+import type {WatchPlugin} from '../types';
+
+const PLUGIN_NAME = 'quit';
+const testPathPatternPlugin: WatchPlugin = {
+  apply: (jestHooks, {stdin, stdout}) => {
+    jestHooks.showPrompt.tapPromise(PLUGIN_NAME, () => {
+      stdout.write('\n');
+      process.exit(0);
+    });
+  },
+  key: 'q'.codePointAt(0),
+  name: PLUGIN_NAME,
+  prompt: 'quit watch mode',
+};
+
+export default testPathPatternPlugin;

packages/jest-cli/src/watch.js

@@ -34,6 +34,12 @@ import {AsyncSeriesWaterfallHook} from 'tapable';
 
 let hasExitListener = false;
 
+const internalPlugins = [
+  require.resolve('./plugins/test_path_pattern'),
+  require.resolve('./plugins/test_name_pattern'),
+  require.resolve('./plugins/quit'),
+];
+
 export default function watch(
   initialGlobalConfig: GlobalConfig,
   contexts: Array<Context>,
@@ -71,8 +77,9 @@ export default function watch(
 
   const watchPlugins = new WatchPluginRegistry(globalConfig.rootDir);
 
-  watchPlugins.loadPluginPath(require.resolve('./plugins/test_path_pattern'));
-  watchPlugins.loadPluginPath(require.resolve('./plugins/test_name_pattern'));
+  internalPlugins.forEach(pluginPath => {
+    watchPlugins.loadPluginPath(pluginPath);
+  });
 
   if (globalConfig.watchPlugins != null) {
     for (const pluginModulePath of globalConfig.watchPlugins) {
@@ -253,10 +260,6 @@ export default function watch(
     }
 
     switch (key) {
-      case KEYS.Q:
-        outputStream.write('\n');
-        exit(0);
-        return;
       case KEYS.ENTER:
         startRun(globalConfig);
         break;
@@ -434,8 +437,6 @@ const usage = (
           chalk.dim(`to ${plugin.prompt}.`),
       ),
 
-    chalk.dim(' \u203A Press ') + 'q' + chalk.dim(' to quit watch mode.'),
-
     chalk.dim(' \u203A Press ') +
       'Enter' +
       chalk.dim(' to trigger a test run.'),