expectNoTextWithin

Author: piotr-iohk

test/helpers/actions.ts

@@ -170,17 +170,34 @@ export async function expectText(
 export async function expectTextWithin(
   ancestorId: string,
   text: string,
-  { visible = true, timeout = 30_000 }: { visible?: boolean; timeout?: number } = {}
+  {
+    visible = true,
+    timeout = 30_000,
+    strategy = 'contains',
+  }: {
+    visible?: boolean;
+    timeout?: number;
+    strategy?: RetrieveStrategy;
+  } = {}
 ) {
   const parent = elementById(ancestorId);
   await parent.waitForDisplayed();
 
   if (driver.isIOS) {
     const parentLabel = await parent.getAttribute('label');
     const parentValue = await parent.getAttribute('value');
-    const matchesParent =
-      (typeof parentLabel === 'string' && parentLabel.includes(text)) ||
-      (typeof parentValue === 'string' && parentValue.includes(text));
+    const matchesParent = (() => {
+      if (strategy === 'exact') {
+        return (
+          (typeof parentLabel === 'string' && parentLabel === text) ||
+          (typeof parentValue === 'string' && parentValue === text)
+        );
+      }
+      return (
+        (typeof parentLabel === 'string' && parentLabel.includes(text)) ||
+        (typeof parentValue === 'string' && parentValue.includes(text))
+      );
+    })();
 
     if (matchesParent) {
       if (!visible) {
@@ -190,9 +207,15 @@ export async function expectTextWithin(
     }
   }
 
-  const needle = driver.isAndroid
-    ? `.//*[contains(@text,'${text}')]`
-    : `.//*[self::XCUIElementTypeStaticText or self::XCUIElementTypeTextView or self::XCUIElementTypeTextField][contains(@label,'${text}') or contains(@value,'${text}')]`;
+  const needle = (() => {
+    if (driver.isAndroid) {
+      return strategy === 'exact' ? `.//*[@text='${text}']` : `.//*[contains(@text,'${text}')]`;
+    }
+
+    return strategy === 'exact'
+      ? `.//*[self::XCUIElementTypeStaticText or self::XCUIElementTypeTextView or self::XCUIElementTypeTextField][@label='${text}' or @value='${text}']`
+      : `.//*[self::XCUIElementTypeStaticText or self::XCUIElementTypeTextView or self::XCUIElementTypeTextField][contains(@label,'${text}') or contains(@value,'${text}')]`;
+  })();
 
   if (!visible) {
     await parent.$(needle).waitForDisplayed({ reverse: true, timeout });
@@ -201,6 +224,10 @@ export async function expectTextWithin(
   }
 }
 
+export async function expectNoTextWithin(ancestorId: string, text: string) {
+  await expectTextWithin(ancestorId, text, { visible: false, strategy: 'exact' });
+}
+
 type Index = number | 'first' | 'last';
 /**
  * Get text from a descendant text element under a container.

test/specs/transfer.e2e.ts

@@ -22,6 +22,8 @@ import {
   waitForToast,
   getTextUnder,
   acknowledgeExternalSuccess,
+  dismissBackgroundPaymentsTimedSheet,
+  expectNoTextWithin,
 } from '../helpers/actions';
 import {
   checkChannelStatus,
@@ -299,22 +301,28 @@ describe('@transfer - Transfer', () => {
     await sleep(500);
 
     // change fee
-    await tap('SetCustomFee');
-    await sleep(500);
-    await tap('NRemove');
-    await sleep(1000); // wait for input to register
-    await tap('FeeCustomContinue');
-    await tap('N5');
-    await sleep(1000); // wait for input to register
-    await tap('FeeCustomContinue');
-
-    // Swipe to confirm (set x offset to avoid navigating back)
+    // skiping for iOS as not implemented
+    // skip: https://github.com/synonymdev/bitkit-ios/issues/285
+    if (driver.isAndroid) {
+      await tap('SetCustomFee');
+      await sleep(500);
+      await tap('NRemove');
+      await sleep(1000); // wait for input to register
+      await tap('FeeCustomContinue');
+      await tap('N5');
+      await sleep(1000); // wait for input to register
+      await tap('FeeCustomContinue');
+    }
+
+    // Swipe to confirm
     await dragOnElement('GRAB', 'right', 0.95);
     console.info('channel opening...');
     await sleep(1000);
     await acknowledgeExternalSuccess();
-    await tap('NavigationBack');
-    await doNavigationClose();
+    if (driver.isAndroid) {
+      await tap('NavigationBack');
+      await doNavigationClose();
+    }
 
     // check transfer card
     // await elementById('Suggestion-lightning_setting_up').waitForDisplayed();
@@ -334,7 +342,14 @@ describe('@transfer - Transfer', () => {
     await mineBlocks(rpc, 6);
     await electrum?.waitForSync();
     await waitForToast('SpendingBalanceReadyToast');
-    await dismissQuickPayIntro();
+    await sleep(1000);
+    if (driver.isIOS) {
+      await dismissBackgroundPaymentsTimedSheet({ triggerTimedSheet: driver.isIOS });
+      await dismissQuickPayIntro({ triggerTimedSheet: driver.isIOS });
+    } else {
+      await dismissQuickPayIntro();
+    }
+    await expectNoTextWithin('ActivitySpending', '0');
     await waitForActiveChannel(lnd, ldkNodeId);
 
     // check transfer card