API tests

.github/workflows/cd_dev.yaml

@@ -17,22 +17,24 @@ jobs:
           message: Merge main into this branch to deploy to dev for testing.
   test:
     needs: merge-branch
+    strategy:
+      matrix:
+        machines:
+          - vlcdhp02
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
       - name: Create .env from secrets
         uses: SpicyPizza/create-envfile@v2
         with:
-          envkey_ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-          envkey_REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
-          envkey_RERUM_REGISTRATION_URL: ${{ secrets.RERUM_REGISTRATION_URL }}
-          envkey_RERUM_API_ADDR: ${{ secrets.RERUM_API_ADDR }}
-          envkey_RERUM_ID_PATTERN: ${{ secrets.RERUM_ID_PATTERN }}
-          envkey_RERUM_ACCESS_TOKEN_URL: ${{ secrets.RERUM_ACCESS_TOKEN_URL }}
+          envkey_RERUM_REGISTRATION_URL: https://devstore.rerum.io/v1
+          envkey_RERUM_API_ADDR: https://devstore.rerum.io/v1/api/
+          envkey_RERUM_ID_PATTERN: https://devstore.rerum.io/v1/id/
+          envkey_RERUM_ACCESS_TOKEN_URL: https://devstore.rerum.io/client/request-new-access-token
       - name: Setup Node.js
         uses: actions/setup-node@master
         with:
-          node-version: "21"
+          node-version: "20"
       - name: Cache node modules
         uses: actions/cache@master
         env:
@@ -48,14 +50,16 @@ jobs:
       - name: Install dependencies and run the test
         run: |
           npm install
-          npm run runtest
+          npm run functionalTests
   deploy:
     if: github.event.pull_request.draft == false
     needs:
       - merge-branch
       - test
     strategy:
       matrix:
+        node-version:
+          - 20
         machines:
           - vlcdhp02
     runs-on: ${{ matrix.machines }}
@@ -70,6 +74,7 @@ jobs:
           cd /srv/node/tiny-node/
           pm2 stop tinyNode
           git stash
+          git checkout ${{ github.head_ref }}
           git pull
           npm install
           pm2 start -i max bin/tinyNode.js

.github/workflows/cd_prod.yaml

@@ -4,38 +4,21 @@ on:
     branches: main
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        machines:
+          - vlcdhprdp02
+    runs-on: ${{ matrix.machines }}
     steps:
       - uses: actions/checkout@master
-      - name: Create .env from secrets
-        uses: SpicyPizza/create-envfile@v2
-        with:
-          envkey_ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-          envkey_REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
-          envkey_RERUM_REGISTRATION_URL: ${{ secrets.RERUM_REGISTRATION_URL }}
-          envkey_RERUM_API_ADDR: ${{ secrets.RERUM_API_ADDR }}
-          envkey_RERUM_ID_PATTERN: ${{ secrets.RERUM_ID_PATTERN }}
-          envkey_RERUM_ACCESS_TOKEN_URL: ${{ secrets.RERUM_ACCESS_TOKEN_URL }}
-      - name: Setup Node.js
-        uses: actions/setup-node@master
-        with:
-          node-version: "21"
-      - name: Cache node modules
-        uses: actions/cache@master
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{
-            hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - name: Install dependencies and run the test
+      - name: Test the app on the server
         run: |
+          cd /srv/node/tiny-node/
+          git stash
+          git checkout main
+          git pull
           npm install
-          npm run runtest
+          npm run allTests
   deploy:
     needs:
       - test
@@ -55,6 +38,7 @@ jobs:
           cd /srv/node/tiny-node/
           pm2 stop tinyNode
           git stash
+          git checkout main
           git pull
           npm install
           pm2 start -i max bin/tinyNode.js

app.js

@@ -13,10 +13,10 @@ import updateRouter from "./routes/update.js"
 import deleteRouter from "./routes/delete.js"
 import overwriteRouter from "./routes/overwrite.js"
 import cors from "cors"
-import {updateExpiredToken } from "./tokens.js"
+import { updateExpiredToken } from "./tokens.js"
 
 // Check for and update token on app start
-updateExpiredToken ()
+//updateExpiredToken()
 
 let app = express()
 

jest.config.js

@@ -188,7 +188,7 @@ const config = {
   // timers: "real",
 
   // A map from regular expressions to paths to transformers
-  // transform: undefined,
+  transform: {},
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   // transformIgnorePatterns: [