Fix server e2e tests on CI #1

twentyhq · Jul 27, 2023 · 61205c2 · 61205c2
1 parent 157e5b9
commit 61205c2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
@@ -26,6 +26,8 @@ jobs:
   server-test:
     needs: postgres-job
     runs-on: ubuntu-latest
+    env:
+      PG_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/test?connection_limit=1
     steps:
       - uses: actions/checkout@v3
         if: github.event_name == 'push'
@@ -48,4 +50,4 @@ jobs:
           cd server && yarn test
       - name: Server / Run e2e tests
         run: |
-          cd server && yarn test:e2e
+          cd server && yarn test:e2e-ci
diff --git a/infra/dev/postgres/init.sql b/infra/dev/postgres/init.sql
@@ -2,4 +2,4 @@
 CREATE DATABASE "default";
 
 -- Create the tests database for e2e testing
-CREATE DATABASE "tests";
+CREATE DATABASE "test";
diff --git a/server/.env.test b/server/.env.test
@@ -7,6 +7,6 @@ REFRESH_TOKEN_EXPIRES_IN=30d
 LOGIN_TOKEN_SECRET=secret_login_token
 LOGIN_TOKEN_EXPIRES_IN=15m
 FRONT_AUTH_CALLBACK_URL=http://localhost:3001/auth/callback
-PG_DATABASE_URL=postgres://postgres:postgrespassword@localhost:5432/tests?connection_limit=1
+PG_DATABASE_URL=postgres://postgres:postgrespassword@localhost:5432/test?connection_limit=1
 STORAGE_TYPE=local
 STORAGE_LOCAL_PATH=.local-storage
diff --git a/server/package.json b/server/package.json
@@ -18,7 +18,8 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "./scripts/run-integration.sh",
+    "test:e2e": "./scripts/setenv.sh && ./scripts/run-integration.sh",
+    "test:e2e-ci": "./scripts/run-integration.sh",
     "prisma:generate-client": "npx prisma generate --generator client && yarn prisma:generate-gql-select",
     "prisma:generate-gql-select": "node scripts/generate-model-select-map.js",
     "prisma:generate-nest-graphql": "npx prisma generate --generator nestgraphql",

diff --git a/server/scripts/run-integration.sh b/server/scripts/run-integration.sh
@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 # src/run-integration.sh
 
-DIR="$(cd "$(dirname "$0")" && pwd)"
-source $DIR/setenv.sh
-
 npx ts-node ./test/utils/check-db.ts
 EXIT_CODE=$?