From 8a372e093fc687bb16cee426c0d123cf0d1890c6 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Wed, 29 Sep 2021 14:22:10 +0200
Subject: [PATCH 1/2] chore: reject `waitUntil` if process exits

---
 e2e/runJest.ts | 51 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/e2e/runJest.ts b/e2e/runJest.ts
index f3aba215e226..486d94213b9e 100644
--- a/e2e/runJest.ts
+++ b/e2e/runJest.ts
@@ -34,7 +34,10 @@ export default function runJest(
   args?: Array<string>,
   options: RunJestOptions = {},
 ): RunJestResult {
-  return normalizeStdoutAndStderr(spawnJest(dir, args, options), options);
+  return normalizeStdoutAndStderrOnResult(
+    spawnJest(dir, args, options),
+    options,
+  );
 }
 
 function spawnJest(
@@ -104,16 +107,24 @@ export interface RunJestJsonResult extends RunJestResult {
   json: FormattedTestResults;
 }
 
-function normalizeStdoutAndStderr(
+function normalizeStreamString(
+  stream: string,
+  options: RunJestOptions,
+): string {
+  if (options.stripAnsi) stream = stripAnsi(stream);
+  stream = normalizeIcons(stream);
+
+  return stream;
+}
+
+function normalizeStdoutAndStderrOnResult(
   result: RunJestResult,
   options: RunJestOptions,
 ): RunJestResult {
-  if (options.stripAnsi) result.stdout = stripAnsi(result.stdout);
-  result.stdout = normalizeIcons(result.stdout);
-  if (options.stripAnsi) result.stderr = stripAnsi(result.stderr);
-  result.stderr = normalizeIcons(result.stderr);
+  const stdout = normalizeStreamString(result.stdout, options);
+  const stderr = normalizeStreamString(result.stderr, options);
 
-  return result;
+  return {...result, stderr, stdout};
 }
 
 // Runs `jest` with `--json` option and adds `json` property to the result obj.
@@ -146,6 +157,7 @@ export const json = function (
 
 type StdErrAndOutString = {stderr: string; stdout: string};
 type ConditionFunction = (arg: StdErrAndOutString) => boolean;
+type CheckerFunction = (arg: StdErrAndOutString) => void;
 
 // Runs `jest` continously (watch mode) and allows the caller to wait for
 // conditions on stdout and stderr and to end the process.
@@ -158,7 +170,21 @@ export const runContinuous = function (
 
   let stderr = '';
   let stdout = '';
-  const pending = new Set<(arg: StdErrAndOutString) => void>();
+  const pending = new Set<CheckerFunction>();
+  const pendingRejection = new WeakMap<CheckerFunction, () => void>();
+
+  jestPromise.addListener('exit', () => {
+    for (const fn of pending) {
+      const reject = pendingRejection.get(fn);
+
+      if (reject) {
+        console.log('stdout', normalizeStreamString(stdout, options));
+        console.log('stderr', normalizeStreamString(stderr, options));
+
+        reject();
+      }
+    }
+  });
 
   const dispatch = () => {
     for (const fn of pending) {
@@ -196,7 +222,7 @@ export const runContinuous = function (
       result.stdout = stdout;
       result.stderr = stderr;
 
-      return normalizeStdoutAndStderr(result, options);
+      return normalizeStdoutAndStderrOnResult(result, options);
     },
 
     getCurrentOutput(): StdErrAndOutString {
@@ -208,13 +234,16 @@ export const runContinuous = function (
     },
 
     async waitUntil(fn: ConditionFunction) {
-      await new Promise<void>(resolve => {
-        const check = (state: StdErrAndOutString) => {
+      await new Promise<void>((resolve, reject) => {
+        const check: CheckerFunction = state => {
           if (fn(state)) {
             pending.delete(check);
+            pendingRejection.delete(check);
             resolve();
           }
         };
+        const error = new Error('Process exited');
+        pendingRejection.set(check, () => reject(error));
         pending.add(check);
       });
     },

From 3d32b76e1016eec96358718a721b6dfcd9be1f26 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Wed, 29 Sep 2021 14:27:36 +0200
Subject: [PATCH 2/2] point to `waitUntil`

---
 e2e/runJest.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/e2e/runJest.ts b/e2e/runJest.ts
index 486d94213b9e..86eb080a3276 100644
--- a/e2e/runJest.ts
+++ b/e2e/runJest.ts
@@ -13,6 +13,7 @@ import * as fs from 'graceful-fs';
 import stripAnsi = require('strip-ansi');
 import type {FormattedTestResults} from '@jest/test-result';
 import type {Config} from '@jest/types';
+import {ErrorWithStack} from 'jest-util';
 import {normalizeIcons} from './Utils';
 
 const JEST_PATH = path.resolve(__dirname, '../packages/jest-cli/bin/jest.js');
@@ -212,7 +213,7 @@ export const runContinuous = function (
     }),
   );
 
-  return {
+  const continuousRun = {
     async end() {
       jestPromise.kill();
 
@@ -242,12 +243,17 @@ export const runContinuous = function (
             resolve();
           }
         };
-        const error = new Error('Process exited');
+        const error = new ErrorWithStack(
+          'Process exited',
+          continuousRun.waitUntil,
+        );
         pendingRejection.set(check, () => reject(error));
         pending.add(check);
       });
     },
   };
+
+  return continuousRun;
 };
 
 // return type matches output of logDebugMessages