Updated new example app for e2e tests

Update e2e-ios.yml

Author: Jasonvdb

.github/workflows/e2e-ios.yml

@@ -1,13 +1,13 @@
 name: e2e-ios
 
 on:
-  push:
+  pull_request:
     branches:
-      - 'e2e-tests'
+      - 'master'
 
 jobs:
   e2e-test:
-    name: Run e2e iOS test
+    name: E2E iOS test
     runs-on: macOS-latest
     timeout-minutes: 30
 

example/App.tsx

@@ -56,6 +56,7 @@ const App = (): ReactElement => {
 			<ScrollView
 				contentInsetAdjustmentBehavior="automatic"
 				style={styles.scrollView}>
+				<Text style={styles.text}>react-native-ldk</Text>
 				<View style={styles.messageContainer}>
 					<Text style={styles.text}>{message}</Text>
 				</View>
@@ -268,7 +269,18 @@ const App = (): ReactElement => {
 					<Button
 						title={'E2E test'}
 						onPress={async (): Promise<void> => {
-							setMessage('SUCCESS');
+							//TODO add more functionality to test
+							const ldkVersion = await ldk.version();
+							if (ldkVersion.isErr()) {
+								return setMessage(ldkVersion.error.message);
+							}
+
+							const nodeIdRes = await ldk.nodeId();
+							if (nodeIdRes.isErr()) {
+								return setMessage(nodeIdRes.error.message);
+							}
+
+							return setMessage('e2e success');
 						}}
 					/>
 				</View>

example/e2e/ldk.e2e.js

@@ -1,5 +1,3 @@
-/*eslint-disable no-undef*/
-
 // https://wix.github.io/Detox/docs/introduction/writing-first-test
 describe('LDK integration test', () => {
 	beforeAll(async () => {
@@ -11,12 +9,21 @@ describe('LDK integration test', () => {
 	});
 
 	it('should have heading', async () => {
-		await expect(element(by.text('react-native-ldk'))).toBeVisible();
+		await waitFor(element(by.text('react-native-ldk')))
+			.toBeVisible()
+			.withTimeout(2000);
 	});
 
-	it('should show "Node running" after tapping start', async () => {
+	it('should show "Running LDK" after starting up', async () => {
 		// await element(by.id('start')).tap();
+		await waitFor(element(by.text('Running LDK')))
+			.toBeVisible()
+			.withTimeout(2000);
+
 		await element(by.text('E2E test')).tap();
-		await expect(element(by.text('SUCCESS'))).toBeVisible();
+
+		await waitFor(element(by.text('e2e success')))
+			.toBeVisible()
+			.withTimeout(2000);
 	});
 });

example/ios/Podfile.lock

@@ -282,7 +282,7 @@ PODS:
   - React-jsinspector (0.68.2)
   - React-logger (0.68.2):
     - glog
-  - react-native-ldk (0.0.41):
+  - react-native-ldk (0.0.43):
     - React
   - react-native-randombytes (3.6.1):
     - React-Core
@@ -554,7 +554,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6
   React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8
   React-logger: a0833912d93b36b791b7a521672d8ee89107aff1
-  react-native-ldk: 099c3739af20b40dd93c9009d368e588e42df5a5
+  react-native-ldk: dc6e4c247ca9b65b6cba3cd1476834f9c73495cb
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989
   React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6

example/ldk/index.ts

@@ -142,7 +142,7 @@ export const setupLdk = async (): Promise<Result<string>> => {
 		await lm.syncLdk();
 
 		console.log(`Node ID: ${nodeIdRes.value}`);
-		return ok(`Node ID: ${nodeIdRes.value}`);
+		return ok('Running LDK'); //e2e test needs to see this string
 	} catch (e) {
 		return err(e.toString());
 	}

example/package.json

@@ -46,7 +46,7 @@
     "detox": "^19.7.1",
     "eslint": "^8.17.0",
     "jest": "^26.6.3",
-    "jest-circus": "28.1.1",
+    "jest-circus": "^26.6.3",
     "metro-react-native-babel-preset": "^0.67.0",
     "react-test-renderer": "17.0.2",
     "rn-nodeify": "^10.3.0",