Merge pull request #124 from Windesheim-AI-App/task/update-tests-in-cicd

chore: 🚧 Optimize E2E tests in CI/CD

.eslintignore

@@ -14,4 +14,4 @@ instrument/
 *.md
 package-lock.json
 
-./fonts.js
+fonts.js

.github/cleanup-action/action.yml

@@ -0,0 +1,9 @@
+name: cleanup-action
+description: test action
+runs:
+    using: 'composite'
+    steps:
+        - name: 'Remove env file'
+          shell: bash
+          run: |
+              rm .env

.github/prepare-action/action.yml

@@ -0,0 +1,37 @@
+name: prepare-action
+description: Prepare build
+
+inputs:
+    openai-api-key:
+        description: 'The OpenAI API key'
+        required: true
+    app-debug:
+        description: 'If the debug mode is enabled'
+        required: true
+    wp-username:
+        description: 'The WordPress username'
+        required: true
+    wp-password:
+        description: 'The WordPress password'
+        required: true
+
+runs:
+    using: 'composite'
+    steps:
+        - name: Set up Node.js
+          uses: actions/setup-node@v3
+          with:
+              node-version: 16.x
+
+        - name: 'Create & configure env file'
+          shell: bash
+          run: |
+              touch .env
+              echo OPENAI_API_KEY=${{ inputs.openai-api-key }} >> .env
+              echo APP_DEBUG=${{ inputs.app-debug }} >> .env
+              echo AI_ENABLED="false" >> .env
+              echo WP_CONTENT_URL="https://www.windesheim.tech" >> .env
+              echo WP_DATA_URL="https://www.windesheim.ai" >> .env
+              echo WP_USERNAME=${{ inputs.wp-username }} >> .env
+              echo WP_PASSWORD=${{ inputs.wp-password }} >> .env
+              cat .env

.github/workflows/app.build.yml

@@ -1,4 +1,4 @@
-name: Build & test
+name: Build
 
 on:
     push:
@@ -20,24 +20,14 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
 
-            - name: Set up Node.js
-              uses: actions/setup-node@v3
+            - uses: ./.github/prepare-action
               with:
-                  node-version: ${{ matrix.node-version }}
+                  openai-api-key: ${{ secrets.OPENAI_API_KEY }}
+                  app-debug: false
+                  wp-username: ${{ secrets.WP_USERNAME }}
+                  wp-password: ${{ secrets.WP_PASSWORD }}
 
-            - name: 'Create & configure env file'
-              run: |
-                  touch .env
-                  echo OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }} >> .env
-                  echo APP_DEBUG="false" >> .env
-                  echo AI_ENABLED="false" >> .env
-                  echo WP_CONTENT_URL="https://www.windesheim.tech" >> .env
-                  echo WP_DATA_URL="https://www.windesheim.ai" >> .env
-                  echo WP_USERNAME=${{ secrets.WP_USERNAME }} >> .env
-                  echo WP_PASSWORD=${{ secrets.WP_PASSWORD }} >> .env
-                  cat .env
-
-            - name: Install dependencies
+            - name: Install NPM dependencies
               run: npm install
 
             - name: Run ESLint
@@ -52,43 +42,4 @@ jobs:
             - name: Run Unit & Component tests
               run: npm run test:jest-less-strict
 
-            - name: 'Remove env file'
-              run: |
-                  rm .env
-
-    end-to-end-testing:
-        runs-on: self-hosted
-        needs: build
-        strategy:
-            matrix:
-                test-platform: [firefox]
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Set up Node.js
-              uses: actions/setup-node@v3
-              with:
-                  node-version: 16.x
-
-            - name: 'Create & configure env file'
-              run: |
-                  touch .env
-                  echo OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }} >> .env
-                  echo APP_DEBUG="false" >> .env
-                  echo AI_ENABLED="false" >> .env
-                  echo WP_CONTENT_URL="https://www.windesheim.tech" >> .env
-                  echo WP_DATA_URL="https://www.windesheim.ai" >> .env
-                  echo WP_USERNAME=${{ secrets.WP_USERNAME }} >> .env
-                  echo WP_PASSWORD=${{ secrets.WP_PASSWORD }} >> .env
-                  cat .env
-
-            - name: Cypress run
-              uses: cypress-io/github-action@v6
-              with:
-                  start: npm run web
-                  browser: ${{ matrix.test-platform }}
-
-            - name: 'Remove env file'
-              run: |
-                  rm .env
+            - uses: ./.github/cleanup-action

.github/workflows/app.e2e_tests.yml

@@ -0,0 +1,36 @@
+name: End to end tests
+
+on:
+    push:
+        branches:
+            - main
+            - development
+    pull_request:
+        branches:
+            - main
+            - development
+
+jobs:
+    tests:
+        runs-on: self-hosted
+        strategy:
+            matrix:
+                test-platform: [firefox, electron]
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - uses: ./.github/prepare-action
+              with:
+                  openai-api-key: ${{ secrets.OPENAI_API_KEY }}
+                  app-debug: false
+                  wp-username: ${{ secrets.WP_USERNAME }}
+                  wp-password: ${{ secrets.WP_PASSWORD }}
+
+            - name: Cypress run
+              uses: cypress-io/github-action@v6
+              with:
+                  start: npm run web
+                  browser: ${{ matrix.test-platform }}
+
+            - uses: ./.github/cleanup-action

.gitignore

@@ -48,6 +48,7 @@ coverage-jest/
 .nyc_output/
 instrumented/
 *.snap
+.eslintcache
 
 %ProgramData%/**/.*
 /%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver

cypress/e2e/0.cy.ts

@@ -1,7 +1,5 @@
 describe('wait for server', () => {
-    it('waits for server', () => {
-        // Wait for the server to start up
-        cy.wait(30_000);
+    it('waits for server', { retries: 3 }, () => {
         cy.visit('/');
     });
 });

package.json

@@ -12,9 +12,10 @@
         "web": "expo start --web",
         "eject": "expo eject",
         "cypress": "cypress open",
-        "lint": "echo \"Running eslint check\" && eslint . --max-warnings=0",
+        "expo:fix": "npx expo install --fix",
+        "lint": "echo \"Running eslint check\" && eslint . --max-warnings=0 --cache **/*.ts",
         "test:eslint": "npm run lint",
-        "lint:fix": "echo \"Running eslint check\" && eslint . --fix --max-warnings=0",
+        "lint:fix": "echo \"Running eslint check\" && eslint . --fix --max-warnings=0 --cache **/*.ts",
         "test:eslint-fix": "npm run lint-fix",
         "prettier": "echo \"Running prettier check\" && prettier . --check",
         "test:prettier": "npm run prettier",

tsconfig.lint.json

@@ -13,5 +13,5 @@
         "app.config.ts",
         "metro.config.js"
     ],
-    "exclude": ["cypress/*"]
+    "exclude": ["cypress/*", "node_modules/*"]
 }