Merge pull request #1350 from flexn-io/chore/e2e-finalisation

Chore/e2e finalisation
flexn-io · Feb 2, 2024 · 9d59d45 · 9d59d45
2 parents cb8d016 + c914d93
commit 9d59d45
Show file tree

Hide file tree

Showing 22 changed files with 118 additions and 92 deletions.
diff --git a/.github/workflows/e2e-harness-android.yml b/.github/workflows/e2e-harness-android.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-harness-android:
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/app-harness && yarn build:android-test
+                  cd packages/app-harness && yarn run:android-test & sleep 180
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:android
+                  cd packages/app-harness && yarn e2e:android && kill $(lsof -t -i:8083)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-harness-androidtv.yml b/.github/workflows/e2e-harness-androidtv.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-harness-androidtv:
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/app-harness && yarn build:androidtv-test
+                  cd packages/app-harness && yarn run:androidtv-test & sleep 180
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:androidtv
+                  cd packages/app-harness && yarn e2e:androidtv && kill $(lsof -t -i:8084)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-harness-ios.yml b/.github/workflows/e2e-harness-ios.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-harness-ios:
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/app-harness && yarn build:ios-test
+                  cd packages/app-harness && yarn run:ios-test & sleep 1200
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:ios
+                  cd packages/app-harness && yarn e2e:ios && kill $(lsof -t -i:8082)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-harness-macos.yml b/.github/workflows/e2e-harness-macos.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-harness-macos:

diff --git a/.github/workflows/e2e-harness-tvos.yml b/.github/workflows/e2e-harness-tvos.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-harness-tvos:
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/app-harness && yarn build:tvos-test
+                  cd packages/app-harness && yarn run:tvos-test & sleep 1200
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:tvos
+                  cd packages/app-harness && yarn e2e:tvos && kill $(lsof -t -i:8089)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-harness-web.yml b/.github/workflows/e2e-harness-web.yml
@@ -5,17 +5,17 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 

diff --git a/.github/workflows/e2e-template-android.yml b/.github/workflows/e2e-template-android.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-template-android:
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/template-starter && yarn build:android-test
+                  cd packages/template-starter && yarn run:android-test & sleep 180
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:android
+                  cd packages/template-starter && yarn e2e:android && kill $(lsof -t -i:8083)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-template-androidtv.yml b/.github/workflows/e2e-template-androidtv.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-template-androidtv:
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/template-starter && yarn build:androidtv-test
+                  cd packages/template-starter && yarn run:androidtv-test & sleep 180
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:androidtv
+                  cd packages/template-starter && yarn e2e:androidtv && kill $(lsof -t -i:8084)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-template-ios.yml b/.github/workflows/e2e-template-ios.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-template-ios:
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/template-starter && yarn build:ios-test
+                  cd packages/template-starter && yarn run:ios-test & sleep 1200
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:ios
+                  cd packages/template-starter && yarn e2e:ios && kill $(lsof -t -i:8082)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-template-macos.yml b/.github/workflows/e2e-template-macos.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-template-macos:

diff --git a/.github/workflows/e2e-template-tvos.yml b/.github/workflows/e2e-template-tvos.yml
@@ -16,8 +16,8 @@ on:
     #         - '**/metadata.json'
     #         - '**/renative.json'
     #         - '**/package.json'
-    pull_request:
-        types: [labeled]
+    # pull_request:
+    #     types: [labeled]
 
 jobs:
     e2e-template-tvos:
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap-clean
-            - name: Build
+            - name: Run
               run: |
-                  cd packages/template-starter && yarn build:tvos-test
+                  cd packages/template-starter && yarn run:tvos-test & sleep 1200
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:tvos
+                  cd packages/template-starter && yarn e2e:tvos && kill $(lsof -t -i:8089)
             # Commented because e2e tests would fail due to minion issues
             # - name: Post message to Slack via Webhook
             #   if: ${{ github.event_name == 'push' && failure() }}

diff --git a/.github/workflows/e2e-template-web.yml b/.github/workflows/e2e-template-web.yml
@@ -5,17 +5,17 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
     pull_request:
         types: [labeled]
 

diff --git a/packages/app-harness/appConfigs/base/renative.json b/packages/app-harness/appConfigs/base/renative.json
@@ -93,7 +93,7 @@
                 },
                 "test": {
                     "runScheme": "Debug",
-                    "bundleAssets": true,
+                    "bundleAssets": false,
                     "sdk": "iphonesimulator"
                 },
                 "release": {
@@ -120,7 +120,7 @@
                 },
                 "test": {
                     "runScheme": "Debug",
-                    "bundleAssets": true,
+                    "bundleAssets": false,
                     "sdk": "appletvsimulator"
                 },
                 "release": {
@@ -173,7 +173,7 @@
                 },
                 "test": {
                     "signingConfig": "Debug",
-                    "bundleAssets": true
+                    "bundleAssets": false
                 },
                 "canary": {
                     "signingConfig": "Release",
@@ -206,7 +206,7 @@
                 },
                 "test": {
                     "signingConfig": "Debug",
-                    "bundleAssets": true
+                    "bundleAssets": false
                 },
                 "release": {
                     "signingConfig": "Release",
@@ -233,7 +233,7 @@
                 },
                 "test": {
                     "signingConfig": "Debug",
-                    "bundleAssets": true
+                    "bundleAssets": false
                 },
                 "release": {
                     "signingConfig": "Release",
@@ -260,7 +260,7 @@
                 },
                 "test": {
                     "signingConfig": "Debug",
-                    "bundleAssets": true
+                    "bundleAssets": false
                 },
                 "release": {
                     "signingConfig": "Release",

diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json
@@ -21,6 +21,10 @@
         "build:ios-test": "npx rnv build -p ios -s test --packageManager yarn --ci -r",
         "build:macos-test": "npx rnv build -p macos -s test --packageManager yarn --ci -r",
         "build:tvos-test": "npx rnv build -p tvos -s test --packageManager yarn --ci -r",
+        "run:android-test": "npx rnv run -p android -s test --packageManager yarn --ci -r",
+        "run:androidtv-test": "npx rnv run -p androidtv -s test --packageManager yarn --ci -r",
+        "run:ios-test": "npx rnv run -p ios -s test --packageManager yarn --ci -r",
+        "run:tvos-test": "npx rnv run -p tvos -s test --packageManager yarn --ci -r",
         "e2e:android": "APPIUM_HOME=./ PLATFORM=android JAVA_HOME=$(/usr/libexec/java_home) wdio wdio.conf.cjs",
         "e2e:androidtv": "APPIUM_HOME=./ PLATFORM=androidtv JAVA_HOME=$(/usr/libexec/java_home) wdio wdio.conf.cjs",
         "e2e:ios": "APPIUM_HOME=./ PLATFORM=ios wdio wdio.conf.cjs",

diff --git a/packages/app-harness/src/app/index.tsx b/packages/app-harness/src/app/index.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react';
 import { Text, View } from 'react-native';
+import { testProps } from '../config';
 import SplashScreen from 'react-native-splash-screen';
 
 const App = () => {
@@ -8,7 +9,7 @@ const App = () => {
     }, []);
     return (
         <View>
-            <Text>ReNative Harness</Text>
+            <Text {...testProps('app-harness-home-screen-intro-text')}>ReNative Harness</Text>
             <Text>{`hermes: ${typeof HermesInternal === 'object' && HermesInternal !== null ? 'yes' : 'no'}`}</Text>
         </View>
     );

diff --git a/packages/app-harness/src/app/index.web.tsx b/packages/app-harness/src/app/index.web.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
+import { testProps } from '../config';
 import { Text, View } from 'react-native';
 
 const App = () => {
     return (
         <View>
-            <Text>ReNative Harness</Text>
+            <Text {...testProps('app-harness-home-screen-intro-text')}>ReNative Harness</Text>
             <Text>{`hermes: ${typeof HermesInternal === 'object' && HermesInternal !== null ? 'yes' : 'no'}`}</Text>
         </View>
     );