Fixed Cypress exit code logic

mate-academy · Jan 24, 2024 · 5c12c03 · 5c12c03
1 parent 878da65
commit 5c12c03
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 3 deletions.
diff --git a/mate-scripts/src/services/Cypress.service.ts b/mate-scripts/src/services/Cypress.service.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { execBashCodeAsync } from '../tools';
+import { execBashCodeAsyncWithOutput } from '../tools';
 
 export interface StartedServer {
   stop: () => void;
@@ -83,10 +83,18 @@ export class CypressService {
           ? ` --config baseUrl=http://localhost:${startedServer.port}`
           : '';
 
-        await execBashCodeAsync(
+        const { stdout, stderr, exitCode } = await execBashCodeAsyncWithOutput(
           `${this.binDir}cypress run${baseUrl}`,
           { shouldBindStdout: this.shouldShowLogs },
         );
+
+        // Cypress can return non-zero exit code
+        // because some tests are failed
+        if (exitCode !== 0) {
+          if (!stdout.includes('(Run Finished)')) {
+            throw new Error(stderr);
+          }
+        }
       } catch (e2eError) {
         errors.push(e2eError);
       } finally {
@@ -98,10 +106,18 @@ export class CypressService {
 
     if (this.shouldRunComponents) {
       try {
-        await execBashCodeAsync(
+        const { stdout, stderr, exitCode } = await execBashCodeAsyncWithOutput(
           `${this.binDir}cypress run-ct`,
           { shouldBindStdout: this.shouldShowLogs },
         );
+
+        // Cypress can return non-zero exit code
+        // because some tests are failed
+        if (exitCode !== 0) {
+          if (!stdout.includes('(Run Finished)')) {
+            throw new Error(stderr);
+          }
+        }
       } catch (componentsError) {
         errors.push(componentsError);
       }

diff --git a/mate-scripts/src/tools/execBashCode.ts b/mate-scripts/src/tools/execBashCode.ts
@@ -6,6 +6,12 @@ export type ExecResult<F extends boolean> = F extends true
   ? ChildProcess
   : string;
 
+type ExecBashCodeSyncOuputResult = {
+  stdout: string;
+  stderr: string;
+  exitCode: number;
+}
+
 export function execBashCodeSync(
   bashCode: string,
   shouldBindStdout = true,
@@ -89,6 +95,55 @@ export function execBashCodeAsync(
   }));
 }
 
+export function execBashCodeAsyncWithOutput(
+  bashCode: string,
+  params: ExecBashCodeAsyncParams = defaultExecBashCodeAsyncParams,
+): Promise<ExecBashCodeSyncOuputResult> {
+  const {
+    shouldBindStdout = true,
+    cwd,
+  } = params;
+
+  return new Promise<ExecBashCodeSyncOuputResult>(((resolve, reject) => {
+    const execOptions = { cwd };
+    const childProcess = exec(bashCode, execOptions);
+    let stdout = '';
+    let stderr = '';
+
+    if (childProcess.stdout) {
+      childProcess.stdout.on('data', (data) => {
+        stdout += data.toString();
+
+        if (shouldBindStdout) {
+          console.log(data);
+        }
+      });
+    }
+
+    if (childProcess.stderr) {
+      childProcess.stderr.on('data', (data) => {
+        stderr += data.toString();
+
+        if (shouldBindStdout) {
+          console.error(data);
+        }
+      });
+    }
+
+    childProcess.on('close', (code) => {
+      resolve({
+        stdout,
+        stderr,
+        exitCode: code as number,
+      });
+    });
+
+    childProcess.on('error', (error) => {
+      reject(new Error(`${bashCode}, error: ${error}`));
+    });
+  }));
+}
+
 export function execBashCodeControlled(
   bashCode: string,
   shouldBindStdout = true,