admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix server e2e tests on CI #1

Browse Source
This commit is contained in:
Charles Bochet
2023-07-27 11:53:00 -07:00
parent 157e5b9a2e
commit 61205c2cb0
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-server.yaml vendored
View File

@ -26,6 +26,8 @@ jobs:
server-test: server-test:
needs: postgres-job needs: postgres-job
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
PG_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/test?connection_limit=1
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
if: github.event_name == 'push' if: github.event_name == 'push'
@ -48,4 +50,4 @@ jobs:
cd server && yarn test cd server && yarn test
- name: Server / Run e2e tests - name: Server / Run e2e tests
run: | run: |
cd server && yarn test:e2e cd server && yarn test:e2e-ci

2
infra/dev/postgres/init.sql
View File

@ -2,4 +2,4 @@
CREATE DATABASE "default"; CREATE DATABASE "default";
-- Create the tests database for e2e testing -- Create the tests database for e2e testing
CREATE DATABASE "tests"; CREATE DATABASE "test";

2
server/.env.test
View File

@ -7,6 +7,6 @@ REFRESH_TOKEN_EXPIRES_IN=30d
LOGIN_TOKEN_SECRET=secret_login_token LOGIN_TOKEN_SECRET=secret_login_token
LOGIN_TOKEN_EXPIRES_IN=15m LOGIN_TOKEN_EXPIRES_IN=15m
FRONT_AUTH_CALLBACK_URL=http://localhost:3001/auth/callback 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_TYPE=local
STORAGE_LOCAL_PATH=.local-storage STORAGE_LOCAL_PATH=.local-storage

3
server/package.json
View File

@ -18,7 +18,8 @@
"test:watch": "jest --watch", "test:watch": "jest --watch",
"test:cov": "jest --coverage", "test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "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-client": "npx prisma generate --generator client && yarn prisma:generate-gql-select",
"prisma:generate-gql-select": "node scripts/generate-model-select-map.js", "prisma:generate-gql-select": "node scripts/generate-model-select-map.js",
"prisma:generate-nest-graphql": "npx prisma generate --generator nestgraphql", "prisma:generate-nest-graphql": "npx prisma generate --generator nestgraphql",

3
server/scripts/run-integration.sh
View File

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