Fixes.

jestjs · May 3, 2017 · 3a154f5 · 3a154f5
1 parent 7755849
commit 3a154f5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/packages/jest-cli/src/cli/runCLI.js b/packages/jest-cli/src/cli/runCLI.js
@@ -75,7 +75,9 @@ module.exports = async (
  return watch(globalConfig, contexts, argv, pipe, hasteMapInstances);
  } else {
  const startRun = () => {
- preRunMessage.print(pipe);
+ if (!argv.listTests) {
+ preRunMessage.print(pipe);
+ }
  runJest(
  globalConfig,
  contexts,

diff --git a/packages/jest-cli/src/runJest.js b/packages/jest-cli/src/runJest.js
@@ -154,7 +154,7 @@ const runJest = async (
  pipe: stream$Writable | tty$WriteStream,
  testWatcher: TestWatcher,
  startRun: () => *,
- onComplete: (testResults: any) => void,
+ onComplete: (testResults: any) => any,
 ) => {
  const maxWorkers = getMaxWorkers(argv);
  const pattern = getTestPathPattern(argv);
@@ -176,11 +176,10 @@ const runJest = async (
 
  allTests = sequencer.sort(allTests);
 
- // With --listTests, simply print the test info as JSON and exit.
- if (globalConfig.listTests) {
- const testsJson = JSON.stringify(allTests, null, ' ');
- new Console(pipe, pipe).log(testsJson);
- process.exit(0);
+ if (argv.listTests) {
+ console.log(JSON.stringify(allTests.map(test => test.path)));
+ onComplete && onComplete({success: true});
+ return null;
  }
 
  if (!allTests.length) {

diff --git a/packages/jest-config/src/index.js b/packages/jest-config/src/index.js
@@ -69,7 +69,6 @@ const getConfigs = (
  coverageThreshold: options.coverageThreshold,
  expand: options.expand,
  forceExit: options.forceExit,
- listTests: options.listTests,
  logHeapUsage: options.logHeapUsage,
  mapCoverage: options.mapCoverage,
  noStackTrace: options.noStackTrace,

diff --git a/packages/jest-config/src/normalize.js b/packages/jest-config/src/normalize.js
@@ -376,7 +376,6 @@ function normalize(options: InitialOptions, argv: Object = {}) {
  case 'coverageThreshold':
  case 'expand':
  case 'globals':
- case 'listTests':
  case 'logHeapUsage':
  case 'mapCoverage':
  case 'moduleDirectories':

diff --git a/packages/jest-config/src/validConfig.js b/packages/jest-config/src/validConfig.js
@@ -43,7 +43,6 @@ module.exports = ({
  haste: {
  providesModuleNodeModules: ['react', 'react-native'],
  },
- listTests: false,
  logHeapUsage: true,
  mapCoverage: false,
  moduleDirectories: ['node_modules'],

diff --git a/packages/jest-validate/src/__tests__/fixtures/jestConfig.js b/packages/jest-validate/src/__tests__/fixtures/jestConfig.js
@@ -85,7 +85,6 @@ const validConfig = {
  haste: {
  providesModuleNodeModules: ['react', 'react-native'],
  },
- listTests: true,
  logHeapUsage: true,
  moduleDirectories: ['node_modules'],
  moduleFileExtensions: ['js', 'json', 'jsx', 'node'],

diff --git a/types/Config.js b/types/Config.js
@@ -134,7 +134,6 @@ export type GlobalConfig = {|
  coverageThreshold: {global: {[key: string]: number}},
  expand: boolean,
  forceExit: boolean,
- listTests: boolean,
  logHeapUsage: boolean,
  mapCoverage: boolean,
  noStackTrace: boolean,