chore: upgrade E2E environment to Node 22, Detox 20.50.1, and Android API 34 with improved test stability

Author: sunnylqm

.github/workflows/e2e_android.yml

@@ -16,7 +16,7 @@ concurrency:
 jobs:
   e2e-android:
     runs-on: macos-latest
-    timeout-minutes: 10
+    timeout-minutes: 30
     steps:
       - name: Checkout react-native-update
         uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
@@ -43,25 +43,24 @@ jobs:
           distribution: temurin
           java-version: '17'
 
-      - name: Install testHotUpdate dependencies
-        run: cd Example/testHotUpdate && bun install --frozen-lockfile
+      - name: Install e2etest dependencies
+        run: cd Example/e2etest && bun install --frozen-lockfile
 
       - name: Install react-native-update-cli dependencies
         run: cd react-native-update-cli && bun install --frozen-lockfile
 
       - name: Detox build (android.emu.release)
-        run: cd Example/testHotUpdate && E2E_PLATFORM=android npx detox build --configuration android.emu.release
-
-      - name: Read Detox emulator name
-        id: device
-        run: node -e "console.log('AVD_NAME=' + require('./Example/testHotUpdate/.detoxrc').devices.emulator.device.avdName)" >> $GITHUB_OUTPUT
+        env:
+          DETOX_AVD_NAME: api34
+        run: cd Example/e2etest && E2E_PLATFORM=android bunx detox build --configuration android.emu.release
 
       - name: Detox test (android.emu.release)
         uses: reactivecircus/android-emulator-runner@v2
         env:
           RNU_CLI_ROOT: ${{ github.workspace }}/react-native-update-cli
+          DETOX_AVD_NAME: api34
         with:
-          api-level: 33
+          api-level: 34
           arch: arm64-v8a
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          script: cd Example/testHotUpdate && E2E_PLATFORM=android npx detox test --configuration android.emu.release --headless --record-logs all
+          avd-name: api34
+          script: cd Example/e2etest && E2E_PLATFORM=android bunx detox test --configuration android.emu.release --headless --record-logs all

.github/workflows/e2e_ios.yml

@@ -15,7 +15,7 @@ concurrency:
 jobs:
   e2e-ios:
     runs-on: macos-latest
-    timeout-minutes: 10
+    timeout-minutes: 30
     steps:
       - name: Checkout react-native-update
         uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
@@ -50,24 +50,27 @@ jobs:
       - name: Install applesimutils
         run: HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew && HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils
 
-      - name: Install testHotUpdate dependencies
-        run: cd Example/testHotUpdate && bun install --frozen-lockfile
+      - name: Install e2etest dependencies
+        run: cd Example/e2etest && bun install --frozen-lockfile
 
       - name: Install react-native-update-cli dependencies
         run: cd react-native-update-cli && bun install --frozen-lockfile
 
+      - name: Install CocoaPods dependencies
+        run: cd Example/e2etest/ios && pod install
+
       - name: Rebuild Detox iOS framework cache
         run: |
-          cd Example/testHotUpdate
-          npx detox clean-framework-cache
-          npx detox build-framework-cache
+          cd Example/e2etest
+          bunx detox clean-framework-cache
+          bunx detox build-framework-cache
 
       - name: Detox build (ios.sim.release)
         env:
           RNU_CLI_ROOT: ${{ github.workspace }}/react-native-update-cli
-        run: cd Example/testHotUpdate && E2E_PLATFORM=ios npx detox build --configuration ios.sim.release
+        run: cd Example/e2etest && E2E_PLATFORM=ios bunx detox build --configuration ios.sim.release
 
       - name: Detox test (ios.sim.release)
         env:
           RNU_CLI_ROOT: ${{ github.workspace }}/react-native-update-cli
-        run: cd Example/testHotUpdate && E2E_PLATFORM=ios npx detox test --configuration ios.sim.release
+        run: cd Example/e2etest && E2E_PLATFORM=ios bunx detox test --configuration ios.sim.release

Example/e2etest/.detoxrc.ts

@@ -58,14 +58,23 @@ function detectAndroidAvdName() {
       .split('\n')
       .map(line => line.trim())
       .filter(Boolean);
+
+    const preferredPatterns = [/^api34$/i, /\bapi[_-]?34\b/i, /\b34\b/];
+    for (const pattern of preferredPatterns) {
+      const preferredAvd = avds.find(item => pattern.test(item));
+      if (preferredAvd) {
+        return preferredAvd;
+      }
+    }
+
     if (avds.length > 0) {
       return avds[0];
     }
   } catch {
     // fall through to default
   }
 
-  return 'Pixel_3a_API_33_arm64-v8a';
+  return 'api34';
 }
 
 const iosSimulatorType = detectIosSimulatorType();

Example/e2etest/android/app/build.gradle

@@ -109,7 +109,7 @@ android {
 }
 
 
-def detoxVersion = "20.41.2"
+def detoxVersion = "20.50.1"
 
 repositories {
     maven {

Example/e2etest/e2e/local-merge.test.ts

@@ -4,6 +4,26 @@ import { LOCAL_UPDATE_HASHES, LOCAL_UPDATE_LABELS } from './localUpdateConfig.ts
 const RELOAD_TIMEOUT = 180000;
 const MARK_SUCCESS_TIMEOUT = 30000;
 const MARK_SUCCESS_SETTLE_MS = 1500;
+const DOWNLOAD_SUCCESS_TIMEOUT = 120000;
+
+function getDetoxLaunchArgs() {
+  if (device.getPlatform() !== 'android') {
+    return {};
+  }
+
+  return {
+    launchArgs: {
+      detoxEnableSynchronization: '0',
+    },
+  };
+}
+
+async function relaunchAppPreservingData() {
+  await device.launchApp({
+    newInstance: true,
+    ...getDetoxLaunchArgs(),
+  });
+}
 
 async function tapCheckUpdate() {
   await waitFor(element(by.id('check-update'))).toBeVisible().withTimeout(30000);
@@ -17,8 +37,9 @@ async function waitForBundleLabel(expectedLabel: string) {
 }
 
 async function waitForHash(expectedHash: string) {
+  const visibleHash = expectedHash || '(empty)';
   await waitFor(element(by.id('current-hash')))
-    .toHaveText(`currentHash: ${expectedHash}`)
+    .toHaveText(`currentHash: ${visibleHash}`)
     .withTimeout(RELOAD_TIMEOUT);
 }
 
@@ -29,27 +50,51 @@ async function waitForMarkSuccess() {
   await new Promise(resolve => setTimeout(resolve, MARK_SUCCESS_SETTLE_MS));
 }
 
+async function waitForDownloadSuccess(expectedHash: string) {
+  await waitFor(element(by.id('last-event')))
+    .toHaveText('lastEvent: downloadSuccess')
+    .withTimeout(DOWNLOAD_SUCCESS_TIMEOUT);
+  await waitFor(element(by.id('last-event-version')))
+    .toHaveText(`lastEventVersion: ${expectedHash}`)
+    .withTimeout(DOWNLOAD_SUCCESS_TIMEOUT);
+}
+
 async function waitForReady() {
   await waitFor(element(by.id('check-update'))).toBeVisible().withTimeout(30000);
 }
 
+async function waitForCheckState(expectedStatus: string, expectedResult: string) {
+  await waitFor(element(by.id('last-check-status')))
+    .toHaveText(`lastCheckStatus: ${expectedStatus}`)
+    .withTimeout(RELOAD_TIMEOUT);
+  await waitFor(element(by.id('last-check-result')))
+    .toHaveText(`lastCheckResult: ${expectedResult}`)
+    .withTimeout(RELOAD_TIMEOUT);
+}
+
+async function waitForStrategy(expectedStrategy: 'silentAndNow' | 'silentAndLater') {
+  await waitFor(element(by.id('update-strategy')))
+    .toHaveText(`updateStrategy: ${expectedStrategy}`)
+    .withTimeout(10000);
+}
+
+async function selectStrategy(testId: 'strategy-silent-now' | 'strategy-silent-later') {
+  await waitFor(element(by.id(testId))).toBeVisible().withTimeout(10000);
+  await element(by.id(testId)).tap();
+}
+
 describe('Local Update Merge E2E', () => {
-  beforeAll(async () => {
+  beforeEach(async () => {
     await device.launchApp({
       newInstance: true,
       delete: true,
-      ...(device.getPlatform() === 'android'
-        ? {
-            launchArgs: {
-              detoxEnableSynchronization: '0',
-            },
-          }
-        : {}),
+      ...getDetoxLaunchArgs(),
     });
   });
 
   it('covers local full update, diff merge, and package diff through checkUpdate + silentAndNow', async () => {
     await waitForReady();
+    await waitForStrategy('silentAndNow');
     await waitForBundleLabel(LOCAL_UPDATE_LABELS.base);
 
     await tapCheckUpdate();
@@ -68,5 +113,91 @@ describe('Local Update Merge E2E', () => {
       await waitForHash(LOCAL_UPDATE_HASHES.packagePatch);
       await waitForMarkSuccess();
     }
+
+    const finalLabel =
+      device.getPlatform() === 'android'
+        ? LOCAL_UPDATE_LABELS.packagePatch
+        : LOCAL_UPDATE_LABELS.ppkPatch;
+    const finalHash =
+      device.getPlatform() === 'android'
+        ? LOCAL_UPDATE_HASHES.packagePatch
+        : LOCAL_UPDATE_HASHES.ppkPatch;
+
+    await relaunchAppPreservingData();
+    await waitForReady();
+    await waitForBundleLabel(finalLabel);
+    await waitForHash(finalHash);
+
+    await tapCheckUpdate();
+    await waitForCheckState('completed', 'upToDate');
+    await waitForBundleLabel(finalLabel);
+    await waitForHash(finalHash);
+  });
+
+  it('covers local full update, deferred install, and follow-up deferred patches through silentAndLater', async () => {
+    await waitForReady();
+    await waitForBundleLabel(LOCAL_UPDATE_LABELS.base);
+
+    await selectStrategy('strategy-silent-later');
+    await waitForStrategy('silentAndLater');
+
+    await tapCheckUpdate();
+    await waitForCheckState('completed', `update:${LOCAL_UPDATE_HASHES.full}`);
+    await waitForDownloadSuccess(LOCAL_UPDATE_HASHES.full);
+    await waitForBundleLabel(LOCAL_UPDATE_LABELS.base);
+    await waitForHash('');
+
+    await relaunchAppPreservingData();
+    await waitForReady();
+    await waitForBundleLabel(LOCAL_UPDATE_LABELS.full);
+    await waitForHash(LOCAL_UPDATE_HASHES.full);
+    await waitForMarkSuccess();
+
+    await selectStrategy('strategy-silent-later');
+    await waitForStrategy('silentAndLater');
+    await tapCheckUpdate();
+    await waitForCheckState('completed', `update:${LOCAL_UPDATE_HASHES.ppkPatch}`);
+    await waitForDownloadSuccess(LOCAL_UPDATE_HASHES.ppkPatch);
+    await waitForBundleLabel(LOCAL_UPDATE_LABELS.full);
+    await waitForHash(LOCAL_UPDATE_HASHES.full);
+
+    await relaunchAppPreservingData();
+    await waitForReady();
+    await waitForBundleLabel(LOCAL_UPDATE_LABELS.ppkPatch);
+    await waitForHash(LOCAL_UPDATE_HASHES.ppkPatch);
+    await waitForMarkSuccess();
+
+    if (device.getPlatform() === 'android') {
+      await selectStrategy('strategy-silent-later');
+      await waitForStrategy('silentAndLater');
+      await tapCheckUpdate();
+      await waitForCheckState(
+        'completed',
+        `update:${LOCAL_UPDATE_HASHES.packagePatch}`,
+      );
+      await waitForDownloadSuccess(LOCAL_UPDATE_HASHES.packagePatch);
+      await waitForBundleLabel(LOCAL_UPDATE_LABELS.ppkPatch);
+      await waitForHash(LOCAL_UPDATE_HASHES.ppkPatch);
+
+      await relaunchAppPreservingData();
+      await waitForReady();
+      await waitForBundleLabel(LOCAL_UPDATE_LABELS.packagePatch);
+      await waitForHash(LOCAL_UPDATE_HASHES.packagePatch);
+      await waitForMarkSuccess();
+    }
+
+    const finalLabel =
+      device.getPlatform() === 'android'
+        ? LOCAL_UPDATE_LABELS.packagePatch
+        : LOCAL_UPDATE_LABELS.ppkPatch;
+    const finalHash =
+      device.getPlatform() === 'android'
+        ? LOCAL_UPDATE_HASHES.packagePatch
+        : LOCAL_UPDATE_HASHES.ppkPatch;
+
+    await tapCheckUpdate();
+    await waitForCheckState('completed', 'upToDate');
+    await waitForBundleLabel(finalLabel);
+    await waitForHash(finalHash);
   });
 });