apify-test-tools 0.10.2-beta.12 → 0.10.2-beta.13

package/eslint.config.mjs

@@ -6,7 +6,7 @@ import tsEslint from 'typescript-eslint';
 
 // eslint-disable-next-line import/no-default-export
 export default [
-    { ignores: ['**/dist', 'eslint.config.mjs', 'vitest.config.ts', '.github'] },
+    { ignores: ['**/dist', 'eslint.config.mjs', 'vitest.config.ts', '.github', '.cli-test-*'] },
     ...apify,
     prettier,
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-test-tools",
-  "version": "0.10.2-beta.12",
+  "version": "0.10.2-beta.13",
   "type": "module",
   "description": "TBD",
   "repository": {

package/test/unit/bin/compiled-cli.ts

@@ -7,11 +7,17 @@ import { fileURLToPath } from 'node:url';
 const projectRoot = fileURLToPath(new URL('../../../', import.meta.url));
 const compilerPath = fileURLToPath(new URL('../../../node_modules/typescript/bin/tsc', import.meta.url));
 
-/** Compiles the CLI from the sources into a temporary directory, so tests run it the way users do. */
+/** Compiles the CLI from the sources into a temporary directory, so tests run it the way npm users do. */
 export const compileCli = async () => {
     const buildDir = await mkdtemp(path.join(projectRoot, '.cli-test-'));
-    execFileSync(process.execPath, [compilerPath, '--outDir', buildDir], { cwd: projectRoot });
-    const cliPath = path.join(buildDir, 'bin/main.js');
-    await chmod(cliPath, 0o755);
-    return { cliPath, cleanup: async () => rm(buildDir, { recursive: true, force: true }) };
+    const cleanup = async () => rm(buildDir, { recursive: true, force: true });
+    try {
+        execFileSync(process.execPath, [compilerPath, '--outDir', buildDir], { cwd: projectRoot });
+        const cliPath = path.join(buildDir, 'bin/main.js');
+        await chmod(cliPath, 0o755);
+        return { cliPath, cleanup };
+    } catch (error) {
+        await cleanup();
+        throw error;
+    }
 };

package/test/unit/bin/logging.test.ts

@@ -1,25 +1,21 @@
-import { execFileSync, spawnSync } from 'node:child_process';
+import { spawnSync } from 'node:child_process';
 import { chmod, mkdtemp, rm, writeFile } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import process from 'node:process';
-import { fileURLToPath } from 'node:url';
 
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-const projectRoot = fileURLToPath(new URL('../../../', import.meta.url));
-const compilerPath = fileURLToPath(new URL('../../../node_modules/typescript/bin/tsc', import.meta.url));
+import { compileCli } from './compiled-cli.js';
+
 let cliPath: string;
-let buildDir: string | undefined;
+let cleanup: (() => Promise<void>) | undefined;
 let gitStubDir: string | undefined;
 const sha = '1'.repeat(40);
 
 describe('CLI logging', () => {
     beforeAll(async () => {
-        buildDir = await mkdtemp(path.join(projectRoot, '.cli-test-'));
-        execFileSync(process.execPath, [compilerPath, '--outDir', buildDir], { cwd: projectRoot });
-        cliPath = path.join(buildDir, 'bin/main.js');
-        await chmod(cliPath, 0o755);
+        ({ cliPath, cleanup } = await compileCli());
         gitStubDir = await mkdtemp(path.join(os.tmpdir(), 'apify-cli-logging-'));
         const gitStub = path.join(gitStubDir, 'git');
         await writeFile(
@@ -30,7 +26,7 @@ describe('CLI logging', () => {
     });
 
     afterAll(async () => {
-        if (buildDir) await rm(buildDir, { recursive: true, force: true });
+        await cleanup?.();
         if (gitStubDir) await rm(gitStubDir, { recursive: true, force: true });
     });