Move validation logic to jest-config

jestjs · Nov 2, 2020 · 5c365ab · 5c365ab
1 parent 5a7c9ca
commit 5c365ab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 53 deletions.
diff --git a/docs/Configuration.md b/docs/Configuration.md
@@ -476,7 +476,7 @@ type HasteConfig = {
   computeSha1?: boolean;
   /** The platform to use as the default, e.g. 'ios'. */
   defaultPlatform?: string | null;
-  /** 
+  /**
    * Whether to follow symlinks when crawling for files.
    *   This options cannot be used in projects which use watchman.
    *   Projects with a .watchmanconfig will error if this option is set to true.

diff --git a/e2e/Utils.ts b/e2e/Utils.ts
@@ -290,19 +290,3 @@ export const testIfHg = (...args: Parameters<typeof test>) => {
     test.skip(...args);
   }
 };
-
-// Certain environments (like CITGM and GH Actions) do not come with watchman installed
-let watchmanIsInstalled: boolean | null = null;
-
-export const testIfWatchman = (...args: Parameters<typeof test>) => {
-  if (watchmanIsInstalled === null) {
-    watchmanIsInstalled = which.sync('watchman', {nothrow: true}) !== null;
-  }
-
-  if (watchmanIsInstalled) {
-    test(...args);
-  } else {
-    console.warn('watchman is not installed - skipping some tests');
-    test.skip(...args);
-  }
-};
diff --git a/e2e/__tests__/crawlSymlinks.test.ts b/e2e/__tests__/crawlSymlinks.test.ts
@@ -6,9 +6,8 @@
  */
 import {tmpdir} from 'os';
 import * as path from 'path';
-
-import runJest from '../runJest';
 import {cleanup, writeFiles, writeSymlinks} from '../Utils';
+import runJest from '../runJest';
 
 const DIR = path.resolve(tmpdir(), 'crawl-symlinks-test');
 
@@ -70,21 +69,3 @@ test('Node crawler does not pick up symlinked files by default', () => {
   expect(stderr).toEqual('');
   expect(exitCode).toEqual(1);
 });
-
-test('Should throw if .watchmanconfig used with haste.enableSymlinks', () => {
-  init({'.watchmanconfig': JSON.stringify({})});
-
-  const {stdout, stderr, exitCode} = runJest(DIR, [
-    '--haste={"enableSymlinks": true}',
-  ]);
-
-  expect(stderr).toEqual('');
-  expect(stdout).toContain(
-    'jest-haste-map: haste.enableSymlinks config option was set, but ' +
-      'is incompatible with watchman.\n' +
-      '  Either set haste.enableSymlinks to false or remove ' +
-      '.watchmanconfig to disable watchman. \n' +
-      '  Exiting with code 1.',
-  );
-  expect(exitCode).toEqual(1);
-});
diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -952,6 +952,14 @@ export default function normalize(
     return newOptions;
   }, newOptions);
 
+  if (options.watchman && options.haste?.enableSymlinks) {
+    throw new ValidationError(
+      'Validation Error',
+      'haste.enableSymlinks is incompatible with watchman',
+      'Either set haste.enableSymlinks to false or do not use watchman',
+    );
+  }
+
   newOptions.roots.forEach((root, i) => {
     verifyDirectoryExists(root, `roots[${i}]`);
   });

diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts
@@ -13,7 +13,6 @@ import {EventEmitter} from 'events';
 import {tmpdir} from 'os';
 import * as path from 'path';
 import type {Stats} from 'graceful-fs';
-import {existsSync} from 'graceful-fs';
 import {NodeWatcher, Watcher as SaneWatcher} from 'sane';
 import type {Config} from '@jest/types';
 import {escapePathForRegex} from 'jest-regex-util';
@@ -750,21 +749,6 @@ class HasteMap extends EventEmitter {
       roots: options.roots,
     };
 
-    if (options.enableSymlinks) {
-      const watchmanConfigPath = path.join(options.rootDir, '.watchmanconfig');
-
-      if (existsSync(watchmanConfigPath)) {
-        this._console.error(
-          'jest-haste-map: haste.enableSymlinks config option was set, but ' +
-            'is incompatible with watchman.\n' +
-            '  Either set haste.enableSymlinks to false or remove ' +
-            '.watchmanconfig to disable watchman. \n' +
-            '  Exiting with code 1.',
-        );
-        process.exit(1);
-      }
-    }
-
     const retry = (error: Error) => {
       if (crawl === watchmanCrawl) {
         this._console.warn(