Merge pull request #54 from synonymdev/test/backup

Test/backup

Author: piotr-iohk

test/helpers/actions.ts

@@ -832,8 +832,7 @@ export async function waitForBackup() {
   await tap('HeaderMenu');
   await tap('DrawerSettings');
   await tap('BackupSettings');
-  const allSynced = await elementById('AllSynced');
-  await allSynced.waitForDisplayed();
+  await elementById('AllSynced').waitForDisplayed();
   await doNavigationClose();
 }
 

test/specs/backup.e2e.ts

@@ -16,6 +16,7 @@ import {
   sleep,
   tap,
   typeText,
+  waitForBackup,
 } from '../helpers/actions';
 import { ciIt } from '../helpers/suite';
 
@@ -66,9 +67,11 @@ describe('@backup - Backup', () => {
     await typeText('TagInput', tag);
     await tap('ActivityTagsSubmit');
     // workaround for Android keyboard not hiding (only in emulator)
-    await confirmInputOnKeyboard();
+    if (driver.isAndroid) {
+      await confirmInputOnKeyboard();
+    }
     await sleep(200);
-    await doNavigationClose();
+    await tap('NavigationBack');
     await tap('NavigationBack');
 
     // - change settings (currency to GBP) //
@@ -82,6 +85,7 @@ describe('@backup - Backup', () => {
     await doNavigationClose();
 
     // - add widgets (add PriceWidget) //
+    await sleep(1000); // wait for the app to settle
     await deleteAllDefaultWidgets();
     await tap('WidgetsAdd');
     await tap('WidgetsOnboarding-button');
@@ -99,8 +103,7 @@ describe('@backup - Backup', () => {
 
     // - backup seed and restore wallet //
     const seed = await getSeed();
-    // await waitForBackup();
-    await sleep(10_000); //temp wait (until we have a proper event for backup completion)
+    await waitForBackup();
     await restoreWallet(seed);
 
     // - check if everything was restored
@@ -111,12 +114,9 @@ describe('@backup - Backup', () => {
     // check widget
     await elementById('PriceWidget').waitForDisplayed();
     // check metadata
-
-    // data backup not fully functional yet
-    // https://github.com/synonymdev/bitkit-android/issues/321
-    // await tap('ActivitySavings');
-    // await tap('Activity-1');
-    // const tagElement = await elementById('Tag-${tag}');
-    // await tagElement.waitForDisplayed();
+    await tap('ActivitySavings');
+    await tap('Activity-1');
+    const tagElement = await elementById(`Tag-${tag}-delete`);
+    await tagElement.waitForDisplayed();
   });
 });

test/specs/boost.e2e.ts

@@ -17,6 +17,9 @@ import {
   mineBlocks,
   attemptRefreshOnHomeScreen,
   doNavigationClose,
+  getSeed,
+  waitForBackup,
+  restoreWallet,
 } from '../helpers/actions';
 import { bitcoinURL } from '../helpers/constants';
 import initElectrum from '../helpers/electrum';
@@ -120,16 +123,10 @@ describe('@boost - Boost', () => {
       await doNavigationClose();
     }
 
-    // --- skip due to: https://github.com/synonymdev/bitkit-android/issues/321 --- //
-
-    // boost & transfers backup not working yet
-    // // wipe & restore
-    // const seed = await getSeed();
-    // // await waitForBackup();
-    // await sleep(10_000); //temp wait (until we have a proper event for backup completion)
-    // await restoreWallet(seed);
-
-    // --- skip due to: https://github.com/synonymdev/bitkit-android/issues/321 --- //
+    // wipe & restore
+    const seed = await getSeed();
+    await waitForBackup();
+    await restoreWallet(seed);
 
     // check activity after restore
     await swipeFullScreen('up');
@@ -257,16 +254,10 @@ describe('@boost - Boost', () => {
     await elementById('RBFBoosted').waitForDisplayed();
     await doNavigationClose();
 
-    // --- skip due to: https://github.com/synonymdev/bitkit-android/issues/321 --- //
-
-    // boost & transfers backup not working yet
-    // // wipe & restore
-    // const seed = await getSeed();
-    // // await waitForBackup();
-    // await sleep(10_000); //temp wait (until we have a proper event for backup completion)
-    // await restoreWallet(seed);
-
-    // --- skip due to: https://github.com/synonymdev/bitkit-android/issues/321 --- //
+    // wipe & restore
+    const seed = await getSeed();
+    await waitForBackup();
+    await restoreWallet(seed);
 
     // check activity after restore
     await swipeFullScreen('up');

test/specs/onchain.e2e.ts

@@ -239,6 +239,8 @@ describe('@onchain - Onchain', () => {
     await elementById('CalendarApplyButton').waitForDisplayed();
     await sleep(1000);
     await tap('CalendarClearButton');
+    await sleep(500);
+    await swipeFullScreen('down'); // hide calendar
     await elementById('Activity-1').waitForDisplayed();
     await elementById('Activity-2').waitForDisplayed();
     await elementById('Activity-3').waitForDisplayed();