fix: Windows-specific test timeout issues introduced by Yarn 1.13.0 (j…

…estjs#7838)

.azure-pipelines.yml

@@ -17,7 +17,6 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.symlinks true
         displayName: 'Preserve LF endings and symbolic links on check out'
-      - script: npm install -g yarn@1.9.4
       - template: .azure-pipelines-steps.yml
 
   - job: macOS

.gitignore

@@ -26,6 +26,8 @@
 /website/translated_docs
 /website/i18n/*
 
+/reports/*
+
 coverage
 lerna-debug.log
 npm-debug.log

e2e/runJest.js

@@ -10,7 +10,7 @@
 
 import path from 'path';
 import fs from 'fs';
-import execa, {sync as spawnSync} from 'execa';
+import execa from 'execa';
 import {Writable} from 'readable-stream';
 import stripAnsi from 'strip-ansi';
 import {normalizeIcons} from './Utils';
@@ -20,7 +20,8 @@ const JEST_PATH = path.resolve(__dirname, '../packages/jest-cli/bin/jest.js');
 type RunJestOptions = {
   nodePath?: string,
   skipPkgJsonCheck?: boolean, // don't complain if can't find package.json
-  stripAnsi?: boolean, // remove colors from stdout and stderr
+  stripAnsi?: boolean, // remove colors from stdout and stderr,
+  timeout?: number, // kill the Jest process after X milliseconds
 };
 
 // return the result of the spawned process:
@@ -30,6 +31,16 @@ export default function runJest(
   dir: string,
   args?: Array<string>,
   options: RunJestOptions = {},
+) {
+  return normalizeResult(spawnJest(dir, args, options), options);
+}
+
+// Spawns Jest and returns either a Promise (if spawnAsync is true) or the completed child process
+function spawnJest(
+  dir: string,
+  args?: Array<string>,
+  options: RunJestOptions = {},
+  spawnAsync: boolean = false,
 ) {
   const isRelative = !path.isAbsolute(dir);
 
@@ -51,12 +62,23 @@ export default function runJest(
 
   const env = {...process.env, FORCE_COLOR: 0};
   if (options.nodePath) env['NODE_PATH'] = options.nodePath;
-  const result = spawnSync(JEST_PATH, args || [], {
+
+  const spawnArgs = [JEST_PATH, ...(args || [])];
+  const spawnOptions = {
     cwd: dir,
     env,
     reject: false,
-  });
+    timeout: options.timeout || 0,
+  };
 
+  return (spawnAsync ? execa : execa.sync)(
+    process.execPath,
+    spawnArgs,
+    spawnOptions,
+  );
+}
+
+function normalizeResult(result, options) {
   // For compat with cross-spawn
   result.status = result.code;
 
@@ -101,34 +123,7 @@ export const until = async function(
   text: string,
   options: RunJestOptions = {},
 ) {
-  const isRelative = !path.isAbsolute(dir);
-
-  if (isRelative) {
-    dir = path.resolve(__dirname, dir);
-  }
-
-  const localPackageJson = path.resolve(dir, 'package.json');
-  if (!options.skipPkgJsonCheck && !fs.existsSync(localPackageJson)) {
-    throw new Error(
-      `
-      Make sure you have a local package.json file at
-        "${localPackageJson}".
-      Otherwise Jest will try to traverse the directory tree and find the
-      the global package.json, which will send Jest into infinite loop.
-    `,
-    );
-  }
-
-  const env = {...process.env, FORCE_COLOR: 0};
-  if (options.nodePath) env['NODE_PATH'] = options.nodePath;
-
-  const jestPromise = execa(JEST_PATH, args || [], {
-    cwd: dir,
-    env,
-    reject: false,
-    // this should never take more than 5-6 seconds, bailout after 30
-    timeout: 30000,
-  });
+  const jestPromise = spawnJest(dir, args, {timeout: 30000, ...options}, true);
 
   jestPromise.stderr.pipe(
     new Writable({
@@ -144,15 +139,5 @@ export const until = async function(
     }),
   );
 
-  const result = await jestPromise;
-
-  // For compat with cross-spawn
-  result.status = result.code;
-
-  result.stdout = normalizeIcons(result.stdout);
-  if (options.stripAnsi) result.stdout = stripAnsi(result.stdout);
-  result.stderr = normalizeIcons(result.stderr);
-  if (options.stripAnsi) result.stderr = stripAnsi(result.stderr);
-
-  return result;
+  return normalizeResult(await jestPromise, options);
 };