Merge pull request #37501 from margelo/fix/e2e-tests-ts-issues

.github/workflows/checkE2ETestCode.yml

@@ -0,0 +1,23 @@
+name: Check e2e test code builds correctly
+
+on:
+  workflow_call:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - 'tests/e2e/**'
+      - 'src/libs/E2E/**'
+
+jobs:
+  lint:
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+
+      - name: Verify e2e tests compile correctly
+        run: npm run e2e-test-runner-build

.github/workflows/e2ePerformanceTests.yml

@@ -179,23 +179,11 @@ jobs:
       - name: Rename delta APK
         run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2edelta-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2edeltaRelease.apk"
 
-      - name: Copy e2e code into zip folder
-        run: cp -r tests/e2e zip
+      - name: Compile test runner to be executable in a nodeJS environment
+        run: npm run e2e-test-runner-build
 
-      # Note: we can't reuse the apps tsconfig, as it depends on modules that aren't available in the AWS Device Farm environment
-      - name: Write tsconfig.json to zip folder
-        run: |
-          echo '{
-            "compilerOptions": {
-              "target": "ESNext",
-              "module": "commonjs",
-              "strict": true,
-              "esModuleInterop": true,
-              "skipLibCheck": true,
-              "forceConsistentCasingInFileNames": true,
-              "allowJs": true,
-            }
-          }' > zip/tsconfig.json
+      - name: Copy e2e code into zip folder
+        run: cp tests/e2e/dist/index.js zip/testRunner.js
 
       - name: Zip everything in the zip directory up
         run: zip -qr App.zip ./zip

package.json

@@ -55,7 +55,8 @@
     "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
     "workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
     "workflow-test:generate": "ts-node workflow_tests/utils/preGenerateTest.js",
-    "setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1"
+    "setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1",
+    "e2e-test-runner-build": "ncc build tests/e2e/testRunner.js -o tests/e2e/dist/"
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",

tests/e2e/TestSpec.yml

@@ -21,8 +21,7 @@ phases:
   test:
     commands:
       - cd zip
-      - npm install underscore ts-node typescript
-      - npx ts-node e2e/testRunner.js -- --mainAppPath app-e2eRelease.apk --deltaAppPath app-e2edeltaRelease.apk
+      - node testRunner.js -- --mainAppPath app-e2eRelease.apk --deltaAppPath app-e2edeltaRelease.apk
 
 artifacts:
   - $WORKING_DIRECTORY