Fix unhandled error when a bad revision is provided to changedSince

CHANGELOG.md

@@ -25,6 +25,7 @@
 - `[jest-jasmine2`] Fix crash when test return Promise rejected with null ([#7049](https://github.com/facebook/jest/pull/7049))
 - `[jest-runtime]` Check `_isMockFunction` is true rather than truthy on potential global mocks ([#7017](https://github.com/facebook/jest/pull/7017))
 - `[jest-jasmine]` Show proper error message from async `assert` errors ([#6821](https://github.com/facebook/jest/pull/6821))
+- `[jest-cli]` Fix unhandled error when a bad revision is provided to `changedSince` ([#7112](https://github.com/facebook/jest/pull/7112))
 
 ### Chore & Maintenance
 

e2e/__tests__/jest_changed_files.test.js

@@ -15,6 +15,7 @@ import {
  findRepos,
  getChangedFilesForRoots,
 } from '../../packages/jest-changed-files/src';
+import runJest from '../runJest';
 const ConditionalTest = require('../../scripts/ConditionalTest');
 const {cleanup, run, writeFiles} = require('../Utils');
 
@@ -243,6 +244,23 @@ test('monitors only root paths for git', async () => {
  ).toEqual(['file2.txt', 'file3.txt']);
 });
 
+test('handles a bad revision for "changedSince", for git', async () => {
+ writeFiles(DIR, {
+ '.watchmanconfig': '',
+ '__tests__/file1.test.js': `require('../file1'); test('file1', () => {});`,
+ 'file1.js': 'module.exports = {}',
+ 'package.json': '{}',
+ });
+
+ run(`${GIT} init`, DIR);
+ run(`${GIT} add .`, DIR);
+ run(`${GIT} commit -m "first"`, DIR);
+
+ const stderr = runJest(DIR, ['--changedSince=blablabla']).stderr;
+
+ expect(stderr).toMatch(`\n\nfatal: bad revision '^blablabla'\n`);
+});
+
 test('gets changed files for hg', async () => {
  if (process.env.CI) {
  // Circle and Travis have very old version of hg (v2, and current
@@ -371,3 +389,20 @@ test('monitors only root paths for hg', async () => {
  .sort(),
  ).toEqual(['file2.txt', 'file3.txt']);
 });
+
+test('handles a bad revision for "changedSince", for hg', async () => {
+ writeFiles(DIR, {
+ '.watchmanconfig': '',
+ '__tests__/file1.test.js': `require('../file1'); test('file1', () => {});`,
+ 'file1.js': 'module.exports = {}',
+ 'package.json': '{}',
+ });
+
+ run(`${HG} init`, DIR);
+ run(`${HG} add .`, DIR);
+ run(`${HG} commit -m "first"`, DIR);
+
+ const stderr = runJest(DIR, ['--changedSince=blablabla']).stderr;
+
+ expect(stderr).toMatch(`\n\nabort: unknown revision 'blablabla'!\n`);
+});

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

@@ -17,12 +17,22 @@ const findChangedFilesUsingCommand = async (
  args: Array<string>,
  cwd: Path,
 ): Promise<Array<Path>> => {
- const result = await execa('git', args, {cwd});
+ try {
+ const result = await execa('git', args, {cwd});
 
- return result.stdout
- .split('\n')
- .filter(s => s !== '')
- .map(changedPath => path.resolve(cwd, changedPath));
+ return result.stdout
+ .split('\n')
+ .filter(s => s !== '')
+ .map(changedPath => path.resolve(cwd, changedPath));
+ } catch (e) {
+ const errorMsg = e.message.split('\n')[1];
+
+ console.error(`\n\n${errorMsg}\n`);
+
+ process.exit(0);
+
+ return [];
+ }
 };
 
 const adapter: SCMAdapter = {

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

@@ -45,12 +45,22 @@ const adapter: SCMAdapter = {
  }
  args.push(...includePaths);
 
- const result = await execa('hg', args, {cwd, env});
+ try {
+ const result = await execa('hg', args, {cwd, env});
+
+ return result.stdout
+ .split('\n')
+ .filter(s => s !== '')
+ .map(changedPath => path.resolve(cwd, changedPath));
+ } catch (e) {
+ const errorMsg = e.message.split('\n')[1];
 
- return result.stdout
- .split('\n')
- .filter(s => s !== '')
- .map(changedPath => path.resolve(cwd, changedPath));
+ console.error(`\n\n${errorMsg}\n`);
+
+ process.exit(0);
+
+ return [];
+ }
  },
 
  getRoot: async (cwd: Path): Promise<?Path> => {