Merge pull request #1809 from flexn-io/chore/e2e-tests-using-builds

kasinskas · web-flow · commit d0e14dbe9e17 · 2024-12-03T10:03:32.000+02:00
Chore/e2e tests using builds
diff --git a/.github/workflows/e2e-harness-android.yml b/.github/workflows/e2e-harness-android.yml
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-harness-android:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-android' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, android]
+        runs-on: [self-hosted, macos, ARM64]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -31,13 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/app-harness && yarn run:android-test & sleep 480
-
+                  cd packages/app-harness && yarn build:android-test
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:android && kill $(lsof -t -i:8093)
+                  cd packages/app-harness && yarn e2e:android
             # 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
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-harness-androidtv:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-androidtv' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, android]
+        runs-on: [self-hosted, macos, ARM64]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/app-harness && yarn run:androidtv-test & sleep 480
+                  cd packages/app-harness && yarn build:androidtv-test
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:androidtv && kill $(lsof -t -i:8094)
+                  cd packages/app-harness && yarn e2e:androidtv
             # 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
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-harness-ios:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-ios' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, apple]
+        runs-on: [self-hosted, macos, ARM64]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/app-harness && yarn run:ios-test & sleep 420
+                  cd packages/app-harness && yarn build:ios-test
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:ios && kill $(lsof -t -i:8092)
+                  cd packages/app-harness && yarn e2e:ios
             # 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-tvos.yml b/.github/workflows/e2e-harness-tvos.yml
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-harness-tvos:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-tvos' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, apple]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/app-harness && yarn run:tvos-test & sleep 420
+                  cd packages/app-harness && yarn build:tvos-test
             - name: E2E
               run: |
-                  cd packages/app-harness && yarn e2e:tvos && kill $(lsof -t -i:8099)
+                  cd packages/app-harness && yarn e2e:tvos
             # 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
@@ -31,7 +31,7 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Host
+            - name: Run
               run: |
                   cd packages/app-harness && yarn run:web-test & sleep 60
             - name: E2E
diff --git a/.github/workflows/e2e-template-android.yml b/.github/workflows/e2e-template-android.yml
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-template-android:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-android' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, android]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/template-starter && yarn run:android-test & sleep 480
+                  cd packages/template-starter && yarn build:android-test
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:android && kill $(lsof -t -i:8083)
+                  cd packages/template-starter && yarn e2e:android
             # 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
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-template-androidtv:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-androidtv' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, android]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -31,12 +31,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/template-starter && yarn run:androidtv-test & sleep 480
+                  cd packages/template-starter && yarn build:androidtv-test
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:androidtv && kill $(lsof -t -i:8084)
+                  cd packages/template-starter && yarn e2e:androidtv
             # 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
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-template-ios:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-ios' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, apple]
+        runs-on: [self-hosted, macos, ARM64]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/template-starter && yarn run:ios-test & sleep 420
+                  cd packages/template-starter && yarn build:ios-test
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:ios && kill $(lsof -t -i:8082)
+                  cd packages/template-starter && yarn e2e:ios
             # 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-tvos.yml b/.github/workflows/e2e-template-tvos.yml
@@ -22,7 +22,7 @@ on:
 jobs:
     e2e-template-tvos:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-tvos' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, apple]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup
@@ -32,12 +32,12 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Run
+            - name: Build
               run: |
-                  cd packages/template-starter && yarn run:tvos-test & sleep 420
+                  cd packages/template-starter && yarn build:tvos-test
             - name: E2E
               run: |
-                  cd packages/template-starter && yarn e2e:tvos && kill $(lsof -t -i:8085)
+                  cd packages/template-starter && yarn e2e:tvos
             # 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
@@ -31,7 +31,7 @@ jobs:
             - name: Bootstrap
               run: |
                   yarn bootstrap
-            - name: Host
+            - name: Run
               run: |
                   cd packages/template-starter && yarn run:web-test & sleep 60
             - name: E2E
diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json
@@ -16,8 +16,8 @@
     },
     "scripts": {
         "bootstrap": "cd ../.. && yarn bootstrap",
-        "build:android-test": "npx rnv build -p android -s test -c harness --packageManager yarn --ci --yes -r",
-        "build:androidtv-test": "npx rnv build -p androidtv -s test -c harness --packageManager yarn --ci --yes -r",
+        "build:android-test": "npx rnv build -p android -s test -c harness --packageManager yarn --ci -r",
+        "build:androidtv-test": "npx rnv build -p androidtv -s test -c harness --packageManager yarn --ci -r",
         "build:ios-test": "npx rnv build -p ios -s test -c harness --packageManager yarn --ci -r",
         "build:macos-test": "npx rnv build -p macos -s test -c harness --packageManager yarn --ci -r",
         "build:tvos-test": "npx rnv build -p tvos -s test -c harness --packageManager yarn --ci -r",
@@ -30,8 +30,8 @@
         "report": "yarn report:generate && yarn report:open",
         "report:generate": "npx allure generate --clean reporting/allure-results -o reporting/allure-report",
         "report:open": "npx allure open reporting/allure-report",
-        "run:android-test": "npx rnv run -p android -s test -c harness --packageManager yarn --ci --yes -r",
-        "run:androidtv-test": "npx rnv run -p androidtv -s test -c harness --packageManager yarn --ci --yes -r",
+        "run:android-test": "npx rnv run -p android -s test -c harness --packageManager yarn --ci -r",
+        "run:androidtv-test": "npx rnv run -p androidtv -s test -c harness --packageManager yarn --ci -r",
         "run:ios-test": "npx rnv run -p ios -s test -c harness --packageManager yarn --ci -r",
         "run:tvos-test": "npx rnv run -p tvos -s test -c harness --packageManager yarn --ci -r",
         "run:web-test": "npx rnv run -p web -s test -c harness --packageManager yarn --ci",
diff --git a/packages/app-harness/test/specs/e2e.cjs b/packages/app-harness/test/specs/e2e.cjs
@@ -6,6 +6,10 @@ describe('Test App Harness', () => {
     });
 
     it('--> Hermes Support ', async () => {
+        if (process.env.PLATFORM === 'ios') {
+            await FlexnRunner.waitForDisplayedByText('Allow');
+            await FlexnRunner.clickByText('Allow');
+        }
         await FlexnRunner.waitForDisplayedById('app-harness-home-renative-image');
         if (process.env.PLATFORM === 'web') {
             await FlexnRunner.expectToHaveTextById('app-harness-home-hermes-support-text', 'hermes: no');
@@ -74,9 +78,9 @@ describe('Test App Harness', () => {
             await FlexnRunner.expectToBeDisplayedByText('OK');
         } else if (process.env.PLATFORM === 'ios') {
             await FlexnRunner.clickById('app-harness-home-cast-support-button');
-            await FlexnRunner.expectToBeDisplayedByText('Cast to');
+            await FlexnRunner.expectToBeDisplayedByText('No devices available');
         } else {
             await FlexnRunner.expectToHaveTextById('app-harness-home-cast-support-text', 'Not supported');
-        } 
+        }
     });
 });
diff --git a/packages/app-harness/wdio.conf.cjs b/packages/app-harness/wdio.conf.cjs
@@ -21,7 +21,8 @@ const capabilities = {
             'appium:platformVersion': '16.4',
             'appium:automationName': 'XCUITest',
             'appium:bundleId': 'renative.harness.test',
-            // 'appium:app': 'platformBuilds/harness_ios/build/RNVApp/Build/Products/Debug-iphonesimulator/RNVApp.app',
+            'appium:app': 'platformBuilds/harness_ios/build/RNVApp/Build/Products/Release-iphonesimulator/RNVApp.app',
+            'appium:fullReset': true,
         },
     ],
     tvos: [
@@ -31,8 +32,9 @@ const capabilities = {
             'appium:platformVersion': '16.4',
             'appium:automationName': 'XCUITest',
             'appium:bundleId': 'renative.harness.test',
-            // 'appium:app':
-            //     'platformBuilds/harness_tvos/build/RNVApp/Build/Products/Debug-appletvsimulator/RNVApp-tvOS.app',
+            'appium:app':
+                'platformBuilds/harness_tvos/build/RNVApp/Build/Products/Release-appletvsimulator/RNVApp-tvOS.app',
+            'appium:fullReset': true,
         },
     ],
     android: [
@@ -43,7 +45,8 @@ const capabilities = {
             'appium:automationName': 'UiAutomator2',
             'appium:appPackage': 'renative.harness.test',
             'appium:appActivity': 'renative.harness.test.MainActivity',
-            // 'appium:app': 'platformBuilds/harness_android/app/build/outputs/apk/debug/app-debug.apk',
+            'appium:app': 'platformBuilds/harness_android/app/build/outputs/apk/release/app-release.apk',
+            'appium:fullReset': true,
         },
     ],
     androidtv: [
@@ -54,7 +57,8 @@ const capabilities = {
             'appium:automationName': 'UiAutomator2',
             'appium:appPackage': 'renative.harness.test',
             'appium:appActivity': 'renative.harness.test.MainActivity',
-            // 'appium:app': 'platformBuilds/harness_androidtv/app/build/outputs/apk/debug/app-debug.apk',
+            'appium:app': 'platformBuilds/harness_androidtv/app/build/outputs/apk/release/app-release.apk',
+            'appium:fullReset': true,
         },
     ],
     macos: [
diff --git a/packages/template-starter/appConfigs/base/renative.json b/packages/template-starter/appConfigs/base/renative.json
@@ -62,9 +62,8 @@
                     "bundleAssets": false
                 },
                 "test": {
-                    "runScheme": "Debug",
-                    "bundleAssets": false,
-                    "sdk": "iphonesimulator"
+                    "runScheme": "Release",
+                    "bundleAssets": true
                 },
                 "release": {
                     "runScheme": "Release",
@@ -84,9 +83,8 @@
                     "bundleAssets": false
                 },
                 "test": {
-                    "runScheme": "Debug",
-                    "bundleAssets": false,
-                    "sdk": "appletvsimulator"
+                    "runScheme": "Release",
+                    "bundleAssets": true
                 },
                 "release": {
                     "runScheme": "Release",
@@ -124,8 +122,8 @@
                     "bundleAssets": false
                 },
                 "test": {
-                    "signingConfig": "Debug",
-                    "bundleAssets": false
+                    "signingConfig": "Release",
+                    "bundleAssets": true
                 },
                 "canary": {
                     "signingConfig": "Release",
@@ -152,8 +150,8 @@
                     "bundleAssets": false
                 },
                 "test": {
-                    "signingConfig": "Debug",
-                    "bundleAssets": false
+                    "signingConfig": "Release",
+                    "bundleAssets": true
                 },
                 "release": {
                     "signingConfig": "Release",
diff --git a/packages/template-starter/package.json b/packages/template-starter/package.json
@@ -73,8 +73,8 @@
     },
     "scripts": {
         "bootstrap": "cd ../.. && yarn bootstrap",
-        "build:android-test": "npx rnv build -p android -s test -c template --packageManager yarn --ci --yes -r",
-        "build:androidtv-test": "npx rnv build -p androidtv -s test -c template --packageManager yarn --ci --yes -r",
+        "build:android-test": "npx rnv build -p android -s test -c template --packageManager yarn --ci -r",
+        "build:androidtv-test": "npx rnv build -p androidtv -s test -c template --packageManager yarn --ci -r",
         "build:ios-test": "npx rnv build -p ios -s test -c template --packageManager yarn --ci -r",
         "build:macos-test": "npx rnv build -p macos -s test -c template --packageManager yarn --ci -r",
         "build:tvos-test": "npx rnv build -p tvos -s test -c template --packageManager yarn --ci -r",
@@ -87,8 +87,8 @@
         "report": "yarn report:generate && yarn report:open",
         "report:generate": "npx allure generate --clean reporting/allure-results -o reporting/allure-report",
         "report:open": "npx allure open reporting/allure-report",
-        "run:android-test": "npx rnv run -p android -s test -c template --packageManager yarn --ci --yes -r",
-        "run:androidtv-test": "npx rnv run -p androidtv -s test -c template --packageManager yarn --ci --yes -r",
+        "run:android-test": "npx rnv run -p android -s test -c template --packageManager yarn --ci -r",
+        "run:androidtv-test": "npx rnv run -p androidtv -s test -c template --packageManager yarn --ci -r",
         "run:ios-test": "npx rnv run -p ios -s test -c template --packageManager yarn --ci -r",
         "run:tvos-test": "npx rnv run -p tvos -s test -c template --packageManager yarn --ci -r",
         "run:web-test": "npx rnv run -p web -s test -c template --packageManager yarn --ci",
diff --git a/packages/template-starter/wdio.conf.cjs b/packages/template-starter/wdio.conf.cjs
