Merge pull request #45 from synonymdev/test/receive

Test/receive

Author: piotr-iohk

test/helpers/actions.ts

@@ -175,9 +175,24 @@ export async function expectTextWithin(
   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));
+
+    if (matchesParent) {
+      if (!visible) {
+        await parent.waitForDisplayed({ reverse: true, timeout });
+      }
+      return;
+    }
+  }
+
   const needle = driver.isAndroid
     ? `.//*[contains(@text,'${text}')]`
-    : `.//XCUIElementTypeStaticText[contains(@label,'${text}') or contains(@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 });
@@ -390,10 +405,16 @@ export async function confirmInputOnKeyboard() {
       await driver.hideKeyboard();
     } catch {}
   } else {
+    for (const el of ['return', 'done', 'go']) {
     try {
-      await elementByText('return').click();
-    } catch {
-      // Swallow the error; keyboard might already be closed
+        const elem = await elementByText(el);
+        await elem.waitForDisplayed({ timeout: 2000 });
+        await elem.click();
+        return;
+      } catch {
+        // Swallow the error; keyboard might already be closed
+        console.warn(`Not closing keyboard on element: ${el}`);
+      }
     }
   }
 }

test/specs/receive.e2e.ts

@@ -7,6 +7,7 @@ import {
   expectTextWithin,
   getReceiveAddress,
   sleep,
+  swipeFullScreen,
   tap,
   typeText,
 } from '../helpers/actions';
@@ -26,11 +27,19 @@ describe('@receive - Receive', () => {
     }
 
     // Onchain/Lightning details
-    await dragOnElement('ReceiveSlider', 'left', 0.7);
+    if (driver.isIOS) {
+      await tap('ShowDetails');
+    } else {
+      await dragOnElement('ReceiveSlider', 'left', 0.7);
+    }
     await elementById('ReceiveScreen').waitForDisplayed();
 
     // ReceiveDetail
-    await dragOnElement('ReceiveScreen', 'right', 0.7);
+    if (driver.isIOS) {
+      await tap('QRCode');
+    } else {
+      await dragOnElement('ReceiveScreen', 'right', 0.7);
+    }
     await sleep(1000);
     await tap('SpecifyInvoiceButton');
 
@@ -59,31 +68,41 @@ describe('@receive - Receive', () => {
 
     // Show QR
     await tap('ShowQrReceive');
+    await sleep(500);
 
     // Back to ReceiveDetail
     // data should still be there
     await tap('SpecifyInvoiceButton');
     await expectText('123');
     await expectTextWithin('ReceiveNote', note);
-    await expectText(tag);
+    // tags not shown on iOS
+    // https://github.com/synonymdev/bitkit-ios/issues/197
+    if (driver.isAndroid) {
+      await expectText(tag);
+    }
 
     // Close & reopen
-    await dragOnElement('ReceiveScreen', 'down', 0.7);
+    await swipeFullScreen('down');
     await sleep(1000);
     await elementById('Receive').waitForDisplayed();
     await tap('Receive');
 
     // data should be reset
+    await sleep(500);
     await tap('SpecifyInvoiceButton');
     await expectText('123', { visible: false });
     await expectTextWithin('ReceiveNote', note, { visible: false });
     await expectText(tag, { visible: false });
 
-    // check previous tags & delete
-    await tap('TagsAdd');
-    await tap(`Tag-${tag}`);
-    await expectText(tag);
-    await tap(`Tag-${tag}-delete`);
-    await expectText(tag, { visible: false });
+    // tags not shown on iOS
+    // https://github.com/synonymdev/bitkit-ios/issues/197
+    if (driver.isAndroid) {
+      // check previous tags & delete
+      await tap('TagsAdd');
+      await tap(`Tag-${tag}`);
+      await expectText(tag);
+      await tap(`Tag-${tag}-delete`);
+      await expectText(tag, { visible: false });
+    }
   });
 });