tidy precommit/CI configs

.github/workflows/yarn_test.yaml

@@ -28,7 +28,7 @@ jobs:
     - name: run tests
       run: |
         cd apps/nowcasting-app
-        yarn start & sleep 5 && yarn test:ci --coverage --coverageDirectory=../..
+        yarn start & sleep 5 && yarn test --coverage --coverageDirectory=../..
       env:
         AUTH0_AUDIENCE: ${{ secrets.AUTH0_AUDIENCE }}
         AUTH0_BASE_URL: ${{ secrets.AUTH0_BASE_URL }}
@@ -38,6 +38,7 @@ jobs:
         AUTH0_ISSUER_BASE_URL: ${{ secrets.AUTH0_ISSUER_BASE_URL }}
         AUTH0_SCOPE: ${{ secrets.AUTH0_SCOPE }}
         AUTH0_SECRET: ${{ secrets.AUTH0_SECRET }}
+        NEXT_PUBLIC_API_PREFIX: ${{ secrets.NEXT_PUBLIC_API_PREFIX }}
         NEXT_PUBLIC_AUTH0_AUDIENCE: ${{ secrets.NEXT_PUBLIC_AUTH0_AUDIENCE }}
         NEXT_PUBLIC_AUTH0_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_AUTH0_CLIENT_ID }}
         NEXT_PUBLIC_AUTH0_DOMAIN: ${{ secrets.NEXT_PUBLIC_AUTH0_DOMAIN }}

.husky/pre-commit

@@ -1,6 +1,15 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-cd apps/nowcasting-app
+cd apps/nowcasting-app || exit
 yarn lint
-yarn test
+
+# check if the server is already running and save the boolean result
+serverRunning=$(lsof -t -i :3002)
+# if the server is running, just run the tests and don't start the server
+if [ -z "$serverRunning" ]; then
+  yarn test
+else
+  # if the server isn't running, start it, run the tests, and then kill the server after the tests are done
+  yarn dev & yarn test && lsof -t -i :3002 | xargs kill
+fi

apps/nowcasting-app/package.json

@@ -10,8 +10,7 @@
     "build-storybook": "build-storybook",
     "lint": "next lint",
     "pre-commit": "pre-commit run",
-    "test": "yarn dev & cypress run --browser chrome && jest && lsof -t -i :3002 | xargs kill",
-    "test:ci": "cypress run --browser chrome && jest"
+    "test": "cypress run --browser chrome && jest"
   },
   "dependencies": {
     "@auth0/nextjs-auth0": "^1.8.0",