Merge pull request #116 from synonymdev/test/migration

Test/migration 2

Author: piotr-iohk

.github/workflows/migration-wallet-setup.yml

@@ -13,7 +13,7 @@ on:
         type: string
         default: "v1.1.6"
       setup_type:
-        description: "Wallet setup type (standard | sweep)"
+        description: "Wallet setup type (standard | passphrase | sweep)"
         required: true
         type: string
       scenario_name:
@@ -72,6 +72,7 @@ jobs:
         working-directory: bitkit-e2e-tests
         run: |
           rm -f artifacts/migration_setup_standard.env
+          rm -f artifacts/migration_setup_passphrase.env
           rm -f artifacts/migration_setup_sweep.env
 
       - name: Prepare migration wallet 1
@@ -85,7 +86,7 @@ jobs:
           avd-name: Pixel_6
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
-          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ inputs.setup_type == 'sweep' && '@migration_setup_sweep' || '@migration_setup_standard' }}"
+          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "@migration_setup_${{ inputs.setup_type }}"
         env:
           BACKEND: regtest
 
@@ -101,7 +102,7 @@ jobs:
           avd-name: Pixel_6
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
-          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ inputs.setup_type == 'sweep' && '@migration_setup_sweep' || '@migration_setup_standard' }}"
+          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "@migration_setup_${{ inputs.setup_type }}"
         env:
           BACKEND: regtest
 
@@ -116,18 +117,14 @@ jobs:
           avd-name: Pixel_6
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
-          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ inputs.setup_type == 'sweep' && '@migration_setup_sweep' || '@migration_setup_standard' }}"
+          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "@migration_setup_${{ inputs.setup_type }}"
         env:
           BACKEND: regtest
 
       - name: Verify migration env file
         run: |
           set -euo pipefail
-          if [[ "${{ inputs.setup_type }}" == "sweep" ]]; then
-            test -f bitkit-e2e-tests/artifacts/migration_setup_sweep.env
-          else
-            test -f bitkit-e2e-tests/artifacts/migration_setup_standard.env
-          fi
+          test -f "bitkit-e2e-tests/artifacts/migration_setup_${{ inputs.setup_type }}.env"
 
       - name: Upload migration env file
         uses: actions/upload-artifact@v4

test/helpers/actions.ts

@@ -541,11 +541,13 @@ export async function restoreWallet(
     passphrase,
     expectQuickPayTimedSheet = false,
     expectBackupSheet = false,
+    expectBackGroundPaymentsSheet = false,
     reinstall = true,
   }: {
     passphrase?: string;
     expectQuickPayTimedSheet?: boolean;
     expectBackupSheet?: boolean;
+    expectBackGroundPaymentsSheet?: boolean;
     reinstall?: boolean;
   } = {}
 ) {
@@ -603,6 +605,10 @@ export async function restoreWallet(
     await dismissQuickPayIntro();
   }
 
+  if (expectBackGroundPaymentsSheet) {
+    await dismissBackgroundPaymentsTimedSheet();
+  }
+
   // Wait for Suggestions Label to appear
   const suggestions = await elementById('Suggestions');
   await suggestions.waitForDisplayed();

test/helpers/constants.ts

@@ -31,7 +31,8 @@ export function getBackend(): Backend {
   return backend;
 }
 
-export const electrumHost = getBackend() === 'regtest' ? 'electrs.bitkit.stag0.blocktank.to' : '127.0.0.1';
+export const electrumHost =
+  getBackend() === 'regtest' ? 'electrs.bitkit.stag0.blocktank.to' : '127.0.0.1';
 export const electrumPort = getBackend() === 'regtest' ? 9999 : 60001;
 
 // Blocktank API for regtest operations (deposit, mine blocks, pay invoices)

test/specs/migration.e2e.ts

@@ -62,16 +62,11 @@ const TEST_PASSPHRASE = 'supersecret';
 // iOS: Read mnemonic and balance from env vars (prepared by Android run)
 // This is needed because RN app on iOS has poor Appium support
 // Strip quotes if present (GITHUB_ENV format shouldn't have them, but be defensive)
-const stripQuotes = (s: string | undefined): string | undefined =>
-  s?.replace(/^["']|["']$/g, '');
+const stripQuotes = (s: string | undefined): string | undefined => s?.replace(/^["']|["']$/g, '');
 const IOS_RN_MNEMONIC = stripQuotes(process.env.RN_MNEMONIC);
 const IOS_RN_BALANCE = process.env.RN_BALANCE
   ? parseInt(stripQuotes(process.env.RN_BALANCE)!, 10)
   : undefined;
-const IOS_RN_MNEMONIC_SWEEP = stripQuotes(process.env.RN_MNEMONIC_SWEEP);
-const IOS_RN_BALANCE_SWEEP = process.env.RN_BALANCE_SWEEP
-  ? parseInt(stripQuotes(process.env.RN_BALANCE_SWEEP)!, 10)
-  : undefined;
 
 // ============================================================================
 // TEST SUITE
@@ -96,32 +91,55 @@ describe('@migration - Migration from legacy RN app to native app', () => {
     }
 
     const { mnemonic, balance } = await setupLegacyWallet({ returnSeed: true });
-    console.info('→ Waiting 60 seconds to ensure backups triggered...');
-    await sleep(60000);
     writeMigrationEnvFile({
       fileName: 'migration_setup_standard.env',
       mnemonicVar: 'RN_MNEMONIC',
       balanceVar: 'RN_BALANCE',
       mnemonic,
       balance,
     });
+    console.info('→ Waiting 20 seconds to ensure backups...');
+    await sleep(20000);
   });
 
+  ciIt(
+    '@migration_setup_passphrase - Prepare legacy wallet with passphrase (Android only)',
+    async () => {
+      if (driver.isIOS) {
+        throw new Error('Migration setup should run on Android only.');
+      }
+
+      const { mnemonic, balance } = await setupLegacyWallet({
+        returnSeed: true,
+        passphrase: TEST_PASSPHRASE,
+      });
+      writeMigrationEnvFile({
+        fileName: 'migration_setup_passphrase.env',
+        mnemonicVar: 'RN_MNEMONIC',
+        balanceVar: 'RN_BALANCE',
+        mnemonic,
+        balance,
+      });
+      console.info('→ Waiting 20 seconds to ensure backups...');
+      await sleep(20000);
+    }
+  );
+
   ciIt('@migration_setup_sweep - Prepare legacy sweep wallet (Android only)', async () => {
     if (driver.isIOS) {
       throw new Error('Migration setup should run on Android only.');
     }
 
     const { mnemonic, balance } = await setupWalletWithLegacyFunds({ returnSeed: true });
-    console.info('→ Waiting 60 seconds to ensure backups triggered...');
-    await sleep(60000);
     writeMigrationEnvFile({
       fileName: 'migration_setup_sweep.env',
-      mnemonicVar: 'RN_MNEMONIC_SWEEP',
-      balanceVar: 'RN_BALANCE_SWEEP',
+      mnemonicVar: 'RN_MNEMONIC',
+      balanceVar: 'RN_BALANCE',
       mnemonic,
       balance,
     });
+    console.info('→ Waiting 20 seconds to ensure backups...');
+    await sleep(20000);
   });
 
   ciIt('@migration_ios - setupLegacyWallet on iOS', async () => {
@@ -135,8 +153,14 @@ describe('@migration - Migration from legacy RN app to native app', () => {
   // Migration Scenario 1: Uninstall RN, install Native, restore mnemonic
   // --------------------------------------------------------------------------
   ciIt('@migration_1 - Uninstall RN, install Native, restore mnemonic', async () => {
-    // Setup wallet in RN app and get mnemonic
-    const { mnemonic, balance } = await setupLegacyWallet({ returnSeed: true });
+    let mnemonic: string | undefined;
+    let balance: number;
+    if (driver.isIOS) {
+      mnemonic = IOS_RN_MNEMONIC!;
+      balance = IOS_RN_BALANCE!;
+    } else {
+      ({ mnemonic, balance } = await setupLegacyWallet({ returnSeed: true }));
+    }
 
     // Uninstall RN app
     console.info('→ Removing legacy RN app...');
@@ -149,7 +173,11 @@ describe('@migration - Migration from legacy RN app to native app', () => {
     await driver.activateApp(getAppId());
 
     // Restore wallet with mnemonic (uses custom flow to handle backup sheet)
-    await restoreWallet(mnemonic!, { reinstall: false, expectBackupSheet: true });
+    await restoreWallet(mnemonic!, {
+      reinstall: false,
+      expectBackupSheet: driver.isAndroid,
+      expectBackGroundPaymentsSheet: driver.isIOS,
+    });
 
     // Verify migration
     await verifyMigration(balance);
@@ -271,13 +299,19 @@ async function setupLegacyWallet(
           'Run Android tests first to prepare the wallet.'
       );
     }
-    console.info('=== iOS: Restoring RN wallet from mnemonic (prepared by Android) ===');
-    console.info(`→ Mnemonic: ${IOS_RN_MNEMONIC.split(' ').slice(0, 3).join(' ')}...`);
+    console.info(
+      `=== iOS: Restoring RN wallet from mnemonic (prepared by Android)${passphrase ? ' with passphrase' : ''} ===`
+    );
+    console.info(`→ Mnemonic: ${IOS_RN_MNEMONIC}`);
     console.info(`→ Expected balance: ${IOS_RN_BALANCE} sats`);
 
     // Install RN app and restore wallet
     await installLegacyRnApp();
-    await restoreRnWallet(IOS_RN_MNEMONIC, { passphrase });
+    if (passphrase) {
+      await restoreRnWallet(IOS_RN_MNEMONIC, { passphrase });
+    } else {
+      await restoreRnWallet(IOS_RN_MNEMONIC);
+    }
 
     console.info('=== iOS: RN wallet restored ===');
     return { mnemonic: IOS_RN_MNEMONIC, balance: IOS_RN_BALANCE };
@@ -382,23 +416,21 @@ async function setupWalletWithLegacyFunds(
 ): Promise<LegacyWalletSetupResult> {
   const { returnSeed } = options;
   if (driver.isIOS) {
-    if (!IOS_RN_MNEMONIC_SWEEP || !IOS_RN_BALANCE_SWEEP) {
+    if (!IOS_RN_MNEMONIC || !IOS_RN_BALANCE) {
       throw new Error(
-        'iOS migration sweep tests require RN_MNEMONIC_SWEEP and RN_BALANCE_SWEEP env vars. ' +
+        'iOS migration tests require RN_MNEMONIC and RN_BALANCE env vars. ' +
           'Run Android setup first to prepare the wallet.'
       );
     }
     console.info('=== iOS: Restoring RN sweep wallet from mnemonic (prepared by Android) ===');
-    console.info(
-      `→ Mnemonic: ${IOS_RN_MNEMONIC_SWEEP.split(' ').slice(0, 3).join(' ')}...`
-    );
-    console.info(`→ Expected balance: ${IOS_RN_BALANCE_SWEEP} sats`);
+    console.info(`→ Mnemonic: ${IOS_RN_MNEMONIC}`);
+    console.info(`→ Expected balance: ${IOS_RN_BALANCE} sats`);
 
     await installLegacyRnApp();
-    await restoreRnWallet(IOS_RN_MNEMONIC_SWEEP);
+    await restoreRnWallet(IOS_RN_MNEMONIC);
 
     console.info('=== iOS: RN sweep wallet restored ===');
-    return { mnemonic: IOS_RN_MNEMONIC_SWEEP, balance: IOS_RN_BALANCE_SWEEP };
+    return { mnemonic: IOS_RN_MNEMONIC, balance: IOS_RN_BALANCE };
   }
 
   console.info('=== Setting up wallet with legacy funds (sweep scenario) ===');
@@ -452,7 +484,7 @@ async function handleMigrationFlow({ withSweep = false }): Promise<void> {
   try {
     await dismissBackupTimedSheet();
   } catch {
-    console.info('→ Could not dismiss backup timed sheet');
+    console.info('→ Could not dismiss backup timed sheet, trying again...');
     await dismissBackupTimedSheet({ triggerTimedSheet: true });
   }
 }

test/specs/send.e2e.ts

@@ -530,11 +530,11 @@ describe('@send - Send', () => {
     await doNavigationClose();
     await swipeFullScreen('down');
     await swipeFullScreen('down');
-    await tap('ActivitySavings')
+    await tap('ActivitySavings');
     await elementById('Activity-1').waitForDisplayed();
     await elementById('Activity-2').waitForDisplayed();
     await doNavigationClose();
-    await tap('ActivitySpending')
+    await tap('ActivitySpending');
     await elementById('Activity-1').waitForDisplayed();
     await elementById('Activity-2').waitForDisplayed();
   });