@react-native-harness/jest 1.0.0 → 1.1.0-rc.1

package/src/index.ts

@@ -97,16 +97,17 @@ export default class JestHarness implements CallbackTestRunnerInterface {
                 throw new CancelRun();
               }
 
-              if (
-                harnessConfig.resetEnvironmentBetweenTestFiles &&
-                !isFirstTest
-              ) {
-                await harness.restart();
-              }
-              isFirstTest = false;
+                if (
+                  harnessConfig.resetEnvironmentBetweenTestFiles &&
+                  !isFirstTest
+                ) {
+                  await harness.restart(test.path);
+                }
+                isFirstTest = false;
 
               return onStart(test).then(async () => {
                 if (!harnessConfig.detectNativeCrashes) {
+                  await harness.ensureAppReady(test.path);
                   return runHarnessTestFile({
                     testPath: test.path,
                     harness,
@@ -115,10 +116,9 @@ export default class JestHarness implements CallbackTestRunnerInterface {
                   });
                 }
 
-                // Start crash monitoring
-                const crashPromise = harness.crashMonitor.startMonitoring(
-                  test.path
-                );
+                await harness.ensureAppReady(test.path);
+                harness.crashSupervisor.beginTestRun(test.path);
+                const crashPromise = harness.crashSupervisor.waitForCrash(test.path);
 
                 try {
                   const result = await Promise.race([
@@ -133,21 +133,19 @@ export default class JestHarness implements CallbackTestRunnerInterface {
 
                   return result;
                 } finally {
-                  harness.crashMonitor.stopMonitoring();
+                  harness.crashSupervisor.cancelCrashWaiters();
                 }
               });
             })
             .then((result) => onResult(test, result))
             .catch(async (err) => {
               if (err instanceof NativeCrashError) {
+                harness.crashSupervisor.reset();
                 onFailure(test, {
                   message: err.message,
                   stack: '',
                 });
 
-                // Restart the app for the next test file
-                await harness.restart();
-
                 return;
               }
 

package/src/setup.ts

@@ -48,11 +48,6 @@ export const setup = async (globalConfig: JestConfig.GlobalConfig) => {
     // Do not setup again if HARNESS is already initialized
     // This is useful when running tests in watch mode
 
-    if (harnessConfig.resetEnvironmentBetweenTestFiles) {
-      // In watch mode, we want to restart the environment before each test run
-      await global.HARNESS.restart();
-    }
-
     return;
   }
 

package/src/crash-monitor.ts

@@ -1,109 +0,0 @@
-import { HarnessPlatformRunner } from '@react-native-harness/platforms';
-import { BridgeServer } from '@react-native-harness/bridge/server';
-import { NativeCrashError } from './errors.js';
-import { logger } from '@react-native-harness/tools';
-
-export type CrashMonitor = {
-  startMonitoring(testFilePath: string): Promise<never>;
-  stopMonitoring(): void;
-  markIntentionalRestart(): void;
-  clearIntentionalRestart(): void;
-  dispose(): void;
-};
-
-export type CrashMonitorOptions = {
-  interval: number;
-  platformRunner: HarnessPlatformRunner;
-  bridgeServer: BridgeServer;
-};
-
-export const createCrashMonitor = ({
-  interval,
-  platformRunner,
-  bridgeServer,
-}: CrashMonitorOptions): CrashMonitor => {
-  let pollingInterval: NodeJS.Timeout | null = null;
-  let isIntentionalRestart = false;
-  let currentTestFilePath: string | null = null;
-  let rejectFn: ((error: NativeCrashError) => void) | null = null;
-
-  const handleDisconnect = () => {
-    // Verify if it's actually a crash by checking if app is still running
-    if (!isIntentionalRestart && currentTestFilePath) {
-      // Capture the value to avoid it being null when setTimeout callback runs
-      const testFilePath = currentTestFilePath;
-      logger.debug('Bridge disconnected, checking if app crashed');
-      // Use a slight delay to allow the OS to clean up the process
-      setTimeout(async () => {
-        const isRunning = await platformRunner.isAppRunning();
-        if (!isRunning && !isIntentionalRestart && rejectFn) {
-          logger.debug(`Native crash detected during: ${testFilePath}`);
-          rejectFn(new NativeCrashError(testFilePath));
-        }
-      }, 100);
-    }
-  };
-
-  const startMonitoring = (testFilePath: string): Promise<never> => {
-    currentTestFilePath = testFilePath;
-
-    return new Promise<never>((_, reject) => {
-      rejectFn = reject;
-
-      // Listen for bridge disconnect as early indicator
-      bridgeServer.on('disconnect', handleDisconnect);
-
-      // Poll for app running status
-      pollingInterval = setInterval(async () => {
-        // Skip check during intentional restarts
-        if (isIntentionalRestart) {
-          return;
-        }
-
-        try {
-          const isRunning = await platformRunner.isAppRunning();
-
-          if (!isRunning && currentTestFilePath) {
-            logger.debug(
-              `Native crash detected during: ${currentTestFilePath}`
-            );
-            stopMonitoring();
-            reject(new NativeCrashError(currentTestFilePath));
-          }
-        } catch (error) {
-          logger.error('Error checking app status:', error);
-        }
-      }, interval);
-    });
-  };
-
-  const stopMonitoring = () => {
-    if (pollingInterval) {
-      clearInterval(pollingInterval);
-      pollingInterval = null;
-    }
-    bridgeServer.off('disconnect', handleDisconnect);
-    currentTestFilePath = null;
-    rejectFn = null;
-  };
-
-  const markIntentionalRestart = () => {
-    isIntentionalRestart = true;
-  };
-
-  const clearIntentionalRestart = () => {
-    isIntentionalRestart = false;
-  };
-
-  const dispose = () => {
-    stopMonitoring();
-  };
-
-  return {
-    startMonitoring,
-    stopMonitoring,
-    markIntentionalRestart,
-    clearIntentionalRestart,
-    dispose,
-  };
-};