cleanup

Author: stevensJourney

.github/workflows/test-simulators.yaml

@@ -97,7 +97,6 @@ jobs:
       AVD_NAME: capacitor-avd-x86_64-35
       TEST_PLATFORM: android
       TEST_TARGET: emulator-5554
-      TEST_SERVER_HOST: 10.0.2.2
     steps:
       - uses: actions/checkout@v6
         with:
@@ -136,7 +135,7 @@ jobs:
         # This dummy Vitest server URL is only used for the prebuild; the test run
         # updates Capacitor with the actual Vitest URL before launching the app.
         env:
-          CAPACITOR_VITEST_SERVER_URL: http://${{ env.TEST_SERVER_HOST }}
+          CAPACITOR_VITEST_SERVER_URL: http://10.0.2.2
         run: |
           pnpm exec cap sync android
           cd android

packages/capacitor/DEVELOP.md

@@ -16,7 +16,7 @@ cd ..
 
 The test provider reads these environment variables:
 
-- `TEST_PLATFORM`: Native platform to run. Use `ios` or `android`. Defaults to `ios`.
+- `TEST_PLATFORM`: Native platform to run. Use `ios` or `android`.
 - `TEST_TARGET`: Simulator/emulator target id passed to `cap run --target`.
 - `TEST_SERVER_HOST`: Hostname the native app should use to reach the Vitest server. Android defaults to `10.0.2.2`; iOS uses the Vitest URL host as-is.
 
@@ -61,8 +61,7 @@ Run the integration tests on Android:
 cd packages/capacitor
 TEST_PLATFORM=android \
 TEST_TARGET=emulator-5554 \
-TEST_SERVER_HOST=10.0.2.2 \
 pnpm exec vitest run --config vitest.config.ts
 ```
 
-`TEST_SERVER_HOST=10.0.2.2` lets the Android emulator reach the host machine without `adb reverse`. The Vitest config also binds the test server to `0.0.0.0` for this reason.
+Android defaults `TEST_SERVER_HOST` to `10.0.2.2`, which lets the emulator reach the host machine without `adb reverse`. The Vitest config also binds the test server to `0.0.0.0` for this reason.

packages/capacitor/vitest.config.ts

@@ -39,13 +39,9 @@ const environment = {
    * Hostname the app should use to reach the Vitest server. Android emulators use
    * 10.0.2.2 to connect to the host machine instead of the emulator loopback.
    */
-  serverHost: process.env.TEST_SERVER_HOST
+  serverHost: process.env.TEST_SERVER_HOST ?? (process.env.TEST_PLATFORM == 'android' ? '10.0.2.2' : undefined)
 };
 
-if (environment.platform == 'android' && !environment.serverHost) {
-  throw new Error('Missing TEST_SERVER_HOST. See packages/capacitor/DEVELOP.md for Android integration test setup.');
-}
-
 function serverUrlForPlatform(url: string): string {
   if (environment.platform != 'android') {
     return url;
@@ -79,7 +75,7 @@ class CapacitorBrowserProvider implements BrowserProvider {
     console.log(`Opening Capacitor app with Vitest URL: ${serverUrl}`);
 
     // Ensure the target app spawning webviews is up-to-date with the current Vitest server URL.
-    const buildResult = spawnSync('npx', ['cap', 'sync'], {
+    const buildResult = spawnSync('npx', ['cap', 'sync', environment.platform], {
       stdio: 'inherit',
       cwd: EXAMPLE_APP_DIR,
       env: {
@@ -88,7 +84,9 @@ class CapacitorBrowserProvider implements BrowserProvider {
       }
     });
     if (buildResult.status !== 0) {
-      throw new Error(`cap sync failed with exit code ${buildResult.status}`);
+      throw new Error(
+        `cap sync failed with ${buildResult.signal ? `signal ${buildResult.signal}` : `exit code ${buildResult.status}`}`
+      );
     }
     console.log(`Launching ${environment.platform} Capacitor app on ${environment.target}`);
 
@@ -105,7 +103,13 @@ class CapacitorBrowserProvider implements BrowserProvider {
     // The process to run the Capacitor app will end once the app starts,
     // we don't keep track of it, but we do fail if the command failed.
     await new Promise<void>((resolve, reject) => {
-      app.once('exit', () => resolve());
+      app.once('exit', (code, signal) => {
+        if (code === 0) {
+          resolve();
+        } else {
+          reject(new Error(`cap run failed with ${signal ? `signal ${signal}` : `exit code ${code}`}`));
+        }
+      });
       app.once('error', reject);
     });