Merge pull request #90 from synonymdev/fix-ios-tests

fix e2e ios tests

Author: Jasonvdb

.github/scripts/test-ios.sh

@@ -8,17 +8,17 @@ on:
 jobs:
   e2e-test:
     name: E2E iOS test
-    runs-on: macOS-latest
-    timeout-minutes: 35
+    runs-on: macos-12
+    timeout-minutes: 120
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Cache lib node modules
         uses: actions/cache@v3
@@ -75,4 +75,4 @@ jobs:
 
       - name: Test iOS app
         working-directory: example
-        run: sh ../.github/scripts/test-ios.sh
+        run: yarn e2e:ios-test

.github/workflows/e2e-ios.yml

@@ -143,6 +143,24 @@ const App = (): ReactElement => {
 					<Text style={styles.text}>{message}</Text>
 				</View>
 				<View style={styles.container}>
+					<Button
+						title={'E2E test'}
+						onPress={async (): Promise<void> => {
+							//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');
+						}}
+					/>
+
 					<Button
 						title={'Rebroadcast Known Transactions'}
 						onPress={async (): Promise<void> => {
@@ -505,24 +523,6 @@ const App = (): ReactElement => {
 						}}
 					/>
 
-					<Button
-						title={'E2E test'}
-						onPress={async (): Promise<void> => {
-							//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');
-						}}
-					/>
-
 					<Button
 						title={'Backup Current Account'}
 						onPress={async (): Promise<void> => {

example/App.tsx

@@ -3,11 +3,16 @@
   "runnerConfig": "./e2e/config.json",
   "skipLegacyWorkersInjection": true,
   "apps": {
-    "ios": {
+    "ios.debug": {
       "type": "ios.app",
-      "build": "set -o pipefail && xcodebuild -workspace ios/example.xcworkspace -scheme example -sdk iphonesimulator -destination platform=iOS\\ Simulator,OS=15.2,name=iPhone\\ 13 -derivedDataPath ios/build | xcpretty",
+      "build": "xcodebuild -workspace ios/example.xcworkspace -scheme example -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build",
       "binaryPath": "ios/build/Build/Products/Debug-iphonesimulator/example.app"
     },
+    "ios.release": {
+      "type": "ios.app",
+      "build": "xcodebuild -workspace ios/example.xcworkspace -scheme example -configuration Release -sdk iphonesimulator -derivedDataPath ios/build",
+      "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/example.app"
+    },
     "android.debug": {
       "type": "android.apk",
       "binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk",
@@ -25,7 +30,7 @@
     "simulator": {
       "type": "ios.simulator",
       "device": {
-        "type": "iPhone 13"
+        "type": "iPhone 14"
       }
     },
     "emulator": {
@@ -36,9 +41,13 @@
     }
   },
   "configurations": {
-    "ios": {
+    "ios.sim.debug": {
+      "device": "simulator",
+      "app": "ios.debug"
+    },
+    "ios.sim.release": {
       "device": "simulator",
-      "app": "ios"
+      "app": "ios.release"
     },
     "android.debug": {
       "device": "emulator",

example/e2e/detoxrc.json

@@ -7,8 +7,8 @@
     "ios": "react-native run-ios",
     "start": "react-native start",
     "test": "jest",
-    "e2e:ios-build": "detox build --configuration ios",
-    "e2e:ios-test": "detox test --configuration ios --cleanup",
+    "e2e:ios-build": "detox build --configuration ios.sim.release",
+    "e2e:ios-test": "detox test --configuration ios.sim.release --cleanup",
     "lint:check": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "reinstall": "cd ../lib/ && yarn install && yarn build && cd ../example/ && yarn add ../lib && yarn rn-setup",