test: watch full stdout when waiting for match

Author: jbedard

tests/legacy-cli/e2e/tests/build/bundle-budgets.ts

@@ -17,7 +17,7 @@ export default async function () {
     ];
   });
 
-  const errorMessage = await expectToFail(() => ng('build'));
+  const { message: errorMessage } = await expectToFail(() => ng('build'));
   if (!/Error.+budget/.test(errorMessage)) {
     throw new Error('Budget error: all, max error.');
   }

tests/legacy-cli/e2e/utils/process.ts

@@ -29,8 +29,6 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
   // Create a separate instance to prevent unintended global changes to the color configuration
   const colors = ansiColors.create();
 
-  let stdout = '';
-  let stderr = '';
   const cwd = options.cwd ?? process.cwd();
   const env = options.env ?? process.env;
   console.log(
@@ -69,48 +67,65 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
   }
 
   const childProcess = child_process.spawn(cmd, args, spawnOptions);
-  childProcess.stdout!.on('data', (data: Buffer) => {
-    stdout += data.toString('utf-8');
-    if (options.silent) {
-      return;
-    }
-    data
-      .toString('utf-8')
-      .split(/[\n\r]+/)
-      .filter((line) => line !== '')
-      .forEach((line) => console.log('  ' + line));
-  });
-
-  childProcess.stderr!.on('data', (data: Buffer) => {
-    stderr += data.toString('utf-8');
-    if (options.silent) {
-      return;
-    }
-    data
-      .toString('utf-8')
-      .split(/[\n\r]+/)
-      .filter((line) => line !== '')
-      .forEach((line) => console.error(colors.yellow('  ' + line)));
-  });
 
   _processes.push(childProcess);
 
   // Create the error here so the stack shows who called this function.
   const error = new Error();
 
-  // Return log info about the current process status
-  function envDump() {
-    return [
-      `ENV:${JSON.stringify(spawnOptions.env, null, 2)}`,
-      `STDOUT:\n${stdout}`,
-      `STDERR:\n${stderr}`,
-    ].join('\n\n');
-  }
-
   return new Promise<ProcessOutput>((resolve, reject) => {
+    let stdout = '';
+    let stderr = '';
     let matched = false;
 
-    childProcess.on('exit', (code: number) => {
+    // Return log info about the current process status
+    function envDump() {
+      return [
+        `ENV:${JSON.stringify(spawnOptions.env, null, 2)}`,
+        `STDOUT:\n${stdout}`,
+        `STDERR:\n${stderr}`,
+      ].join('\n\n');
+    }
+
+    childProcess.stdout!.on('data', (data: Buffer) => {
+      stdout += data.toString('utf-8');
+
+      if (options.waitForMatch && stdout.match(options.waitForMatch)) {
+        resolve({ stdout, stderr });
+        matched = true;
+      }
+
+      if (options.silent) {
+        return;
+      }
+
+      data
+        .toString('utf-8')
+        .split(/[\n\r]+/)
+        .filter((line) => line !== '')
+        .forEach((line) => console.log('  ' + line));
+    });
+
+    childProcess.stderr!.on('data', (data: Buffer) => {
+      stderr += data.toString('utf-8');
+
+      if (options.waitForMatch && stderr.match(options.waitForMatch)) {
+        resolve({ stdout, stderr });
+        matched = true;
+      }
+
+      if (options.silent) {
+        return;
+      }
+
+      data
+        .toString('utf-8')
+        .split(/[\n\r]+/)
+        .filter((line) => line !== '')
+        .forEach((line) => console.error(colors.yellow('  ' + line)));
+    });
+
+    childProcess.on('close', (code: number) => {
       _processes = _processes.filter((p) => p !== childProcess);
 
       if (options.waitForMatch && !matched) {
@@ -134,24 +149,6 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
       reject(`Process error - "${cmd} ${args.join(' ')}": ${err}...\n\n${envDump()}\n`);
     });
 
-    if (options.waitForMatch) {
-      const match = options.waitForMatch;
-
-      childProcess.stdout!.on('data', (data: Buffer) => {
-        if (data.toString().match(match)) {
-          resolve({ stdout, stderr });
-          matched = true;
-        }
-      });
-
-      childProcess.stderr!.on('data', (data: Buffer) => {
-        if (data.toString().match(match)) {
-          resolve({ stdout, stderr });
-          matched = true;
-        }
-      });
-    }
-
     // Provide input to stdin if given.
     if (options.stdin) {
       childProcess.stdin!.write(options.stdin);
@@ -192,14 +189,14 @@ export function waitForAnyProcessOutputToMatch(
 
         childProcess.stdout!.on('data', (data: Buffer) => {
           stdout += data.toString();
-          if (data.toString().match(match)) {
+          if (stdout.match(match)) {
             resolve({ stdout, stderr });
           }
         });
 
         childProcess.stderr!.on('data', (data: Buffer) => {
           stderr += data.toString();
-          if (data.toString().match(match)) {
+          if (stderr.match(match)) {
             resolve({ stdout, stderr });
           }
         });

tests/legacy-cli/e2e/utils/utils.ts

@@ -3,7 +3,7 @@ import { mkdtemp, realpath, rm } from 'fs/promises';
 import { tmpdir } from 'os';
 import path from 'path';
 
-export function expectToFail(fn: () => Promise<any>, errorMessage?: string): Promise<any> {
+export function expectToFail(fn: () => Promise<any>, errorMessage?: string): Promise<Error> {
   return fn().then(
     () => {
       const functionSource = fn.name || (<any>fn).source || fn.toString();
@@ -13,7 +13,7 @@ export function expectToFail(fn: () => Promise<any>, errorMessage?: string): Pro
       );
     },
     (err) => {
-      return err;
+      return err instanceof Error ? err : new Error(err);
     },
   );
 }