From e7eecd5b541e6fd188542df5061eef841a9d2a86 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Thu, 27 Jul 2023 15:22:10 -0700
Subject: [PATCH] Fix server e2e tests on CI #4

---
 .github/workflows/ci-server.yaml  | 4 +---
 server/package.json               | 3 +--
 server/scripts/run-integration.sh | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
index bc99e75ef..34a79899e 100644
--- a/.github/workflows/ci-server.yaml
+++ b/.github/workflows/ci-server.yaml
@@ -7,8 +7,6 @@ on:
 jobs:
   server-test:
     runs-on: ubuntu-latest
-    env:
-      PG_DATABASE_URL: postgres://postgres:postgrespassword@localhost:5432/test?connection_limit=1
     services:
       postgres:
         image: postgres
@@ -46,4 +44,4 @@ jobs:
           cd server && yarn test
       - name: Server / Run e2e tests
         run: |
-          cd server && yarn test:e2e-ci
+          cd server && yarn test:e2e
diff --git a/server/package.json b/server/package.json
index 1e1e7dca2..f78d290b0 100644
--- a/server/package.json
+++ b/server/package.json
@@ -18,8 +18,7 @@
     "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/setenv.sh && ./scripts/run-integration.sh",
-    "test:e2e-ci": "./scripts/run-integration.sh",
+    "test:e2e": "./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
index 9d7c26a2e..cfdeaa792 100755
--- a/server/scripts/run-integration.sh
+++ b/server/scripts/run-integration.sh
@@ -1,6 +1,9 @@
 #!/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=$?