test: reuse CLI capture helper in remote-config regression

Author: thymikee

src/__tests__/cli-config.test.ts

@@ -27,6 +27,7 @@ async function runCliCapture(
   options?: {
     cwd?: string;
     env?: Record<string, string | undefined>;
+    sendToDaemon?: (req: Omit<DaemonRequest, 'token'>) => Promise<DaemonResponse>;
   },
 ): Promise<RunResult> {
   let stdout = '';
@@ -61,10 +62,12 @@ async function runCliCapture(
     return true;
   }) as typeof process.stderr.write;
 
-  const sendToDaemon = async (req: Omit<DaemonRequest, 'token'>): Promise<DaemonResponse> => {
-    calls.push(req);
-    return { ok: true, data: {} };
-  };
+  const sendToDaemon =
+    options?.sendToDaemon ??
+    (async (req: Omit<DaemonRequest, 'token'>): Promise<DaemonResponse> => {
+      calls.push(req);
+      return { ok: true, data: {} };
+    });
 
   try {
     await runCli(argv, { sendToDaemon });
@@ -280,74 +283,36 @@ test('install-from-source forwards remote-config run id with explicit lease bind
     'utf8',
   );
 
-  let stdout = '';
-  let stderr = '';
-  let code: number | null = null;
   const calls: Array<Omit<DaemonRequest, 'token'>> = [];
-
-  const originalExit = process.exit;
-  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
-  const originalStderrWrite = process.stderr.write.bind(process.stderr);
-  const originalCwd = process.cwd();
-  const previousEnv = new Map<string, string | undefined>();
-
-  process.chdir(project);
-  previousEnv.set('HOME', process.env.HOME);
-  process.env.HOME = home;
-
-  (process as any).exit = ((nextCode?: number) => {
-    throw new ExitSignal(nextCode ?? 0);
-  }) as typeof process.exit;
-  (process.stdout as any).write = ((chunk: unknown) => {
-    stdout += String(chunk);
-    return true;
-  }) as typeof process.stdout.write;
-  (process.stderr as any).write = ((chunk: unknown) => {
-    stderr += String(chunk);
-    return true;
-  }) as typeof process.stderr.write;
-
-  const sendToDaemon = async (req: Omit<DaemonRequest, 'token'>): Promise<DaemonResponse> => {
-    calls.push(req);
-    return {
-      ok: true,
-      data: {
-        launchTarget: 'com.example.demo',
-        packageName: 'com.example.demo',
+  const result = await runCliCapture(
+    [
+      'install-from-source',
+      'https://example.com/app.apk',
+      '--remote-config',
+      remoteConfig,
+      '--lease-id',
+      'lease-demo-001',
+      '--json',
+    ],
+    {
+      cwd: project,
+      env: { HOME: home },
+      sendToDaemon: async (req) => {
+        calls.push(req);
+        return {
+          ok: true,
+          data: {
+            launchTarget: 'com.example.demo',
+            packageName: 'com.example.demo',
+          },
+        };
       },
-    };
-  };
-
-  try {
-    await runCli(
-      [
-        'install-from-source',
-        'https://example.com/app.apk',
-        '--remote-config',
-        remoteConfig,
-        '--lease-id',
-        'lease-demo-001',
-        '--json',
-      ],
-      { sendToDaemon },
-    );
-  } catch (error) {
-    if (error instanceof ExitSignal) code = error.code;
-    else throw error;
-  } finally {
-    process.exit = originalExit;
-    process.stdout.write = originalStdoutWrite;
-    process.stderr.write = originalStderrWrite;
-    process.chdir(originalCwd);
-    for (const [key, value] of previousEnv.entries()) {
-      if (value === undefined) delete process.env[key];
-      else process.env[key] = value;
-    }
-  }
+    },
+  );
 
-  assert.equal(code, null);
-  assert.equal(stderr, '');
-  const payload = JSON.parse(stdout);
+  assert.equal(result.code, null);
+  assert.equal(result.stderr, '');
+  const payload = JSON.parse(result.stdout);
   assert.equal(payload.success, true);
   assert.equal(payload.data.launchTarget, 'com.example.demo');
   assert.equal(calls.length, 1);