From d28f4ae833cbe5a7fd3225fe8dc5eff466e30709 Mon Sep 17 00:00:00 2001 From: sbriat Date: Tue, 18 Jul 2023 14:58:11 +0200 Subject: [PATCH] update env.ci --- ci/.env.ci | 16 ++++++++++++++++ package.json | 7 ++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ci/.env.ci b/ci/.env.ci index 9c4e597..f4fcb00 100644 --- a/ci/.env.ci +++ b/ci/.env.ci @@ -13,3 +13,19 @@ BROKER_IMAGE=rabbitmq:3-alpine # POSTGRES POSTGRES_IMAGE=postgis/postgis:15-3.3 + +# DEFAULT CARPOOL DEPARTURE MARGIN (in seconds) +DEPARTURE_MARGIN=900 + +# DEFAULT ROLE +ROLE=passenger + +# SEATS PROPOSED AS DRIVER / REQUESTED AS PASSENGER +SEATS_PROPOSED=3 +SEATS_REQUESTED=1 + +# ACCEPT ONLY SAME FREQUENCY REQUESTS +STRICT_FREQUENCY=false + +# default timezone +DEFAULT_TIMEZONE=Europe/Paris diff --git a/package.json b/package.json index abdb3ed..7dd1839 100644 --- a/package.json +++ b/package.json @@ -17,17 +17,14 @@ "lint:check": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix-dry-run --ignore-path .gitignore", "pretty:check": "./node_modules/.bin/prettier --check .", "pretty": "./node_modules/.bin/prettier --write .", - "test": "npm run migrate:test && dotenv -e .env.test jest", + "test": "npm run test:unit && npm run test:integration", "test:unit": "jest --testPathPattern 'tests/unit/' --verbose", - "test:unit:watch": "jest --testPathPattern 'tests/unit/' --verbose --watch", "test:unit:ci": "jest --testPathPattern 'tests/unit/' --coverage", "test:integration": "npm run migrate:test && dotenv -e .env.test -- jest --testPathPattern 'tests/integration/' --verbose --runInBand", "test:integration:ci": "npm run migrate:test:ci && dotenv -e ci/.env.ci -- jest --testPathPattern 'tests/integration/' --runInBand", "test:cov": "jest --testPathPattern 'tests/unit/' --coverage", "test:e2e": "jest --config ./test/jest-e2e.json", - "generate": "docker exec v3-ad-api sh -c 'npx prisma generate'", - "migrate": "docker exec v3-ad-api sh -c 'npx prisma migrate dev'", - "migrate:init": "docker exec v3-ad-api sh -c 'npx prisma migrate dev --name init'", + "migrate": "docker exec v3-auth-api sh -c 'npx prisma migrate dev'", "migrate:test": "dotenv -e .env.test -- npx prisma migrate deploy", "migrate:test:ci": "dotenv -e ci/.env.ci -- npx prisma migrate deploy", "migrate:deploy": "npx prisma migrate deploy"