From 2f1bb56576f4329fd5044cf7a8c54a275c82721f Mon Sep 17 00:00:00 2001 From: Jason Efstathiou Date: Wed, 24 Apr 2024 10:28:29 +0200 Subject: [PATCH] fix e2e tests --- docker/app-e2e-test-env | 2 +- docker/env.docker-compose.yml | 2 +- docker/services/multiplayer/envfile | 2 +- package.json | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/app-e2e-test-env b/docker/app-e2e-test-env index 280994dfb..8ec5c339d 100644 --- a/docker/app-e2e-test-env +++ b/docker/app-e2e-test-env @@ -17,5 +17,5 @@ VITE_TEST_MODE=true CACHE_REDIS_CONNECTION_STRING=redis://redis:6379 INFURA_KEY=1234 PUBLIC_BASE_URL=http://localhost:3001 -MULTIPLAYER_API_URL=http://multiplayer:5001 +MULTIPLAYER_API_URL=http://multiplayer:5002 MULTIPLAYER_API_ACCESS_TOKEN=1234 diff --git a/docker/env.docker-compose.yml b/docker/env.docker-compose.yml index 536dd6580..6bfc1de3b 100644 --- a/docker/env.docker-compose.yml +++ b/docker/env.docker-compose.yml @@ -101,7 +101,7 @@ services: volumes: - ./services/multiplayer/db:/docker-entrypoint-initdb.d environment: - POSTGRES_USER: user + POSTGRES_USER: postgres POSTGRES_PASSWORD: admin POSTGRES_DB: dripsdb POSTGRES_INITDB_ARGS: -E UTF8 --locale=C diff --git a/docker/services/multiplayer/envfile b/docker/services/multiplayer/envfile index 3df5b312c..ecdab7d9e 100644 --- a/docker/services/multiplayer/envfile +++ b/docker/services/multiplayer/envfile @@ -2,7 +2,7 @@ PORT=5002 NETWORK=sepolia DB_HOST=postgres-multiplayer DB_PORT=5432 -DB_USER=user +DB_USER=postgres DB_PASSWORD=admin DB_NAME=dripsdb LOG_LEVEL=debug diff --git a/package.json b/package.json index 1b50ad2f0..d10085386 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,13 @@ "private": true, "scripts": { "dev": "vite dev", - "dev:local-env": "GQL_URL=http://localhost:8080 PUBLIC_PINATA_GATEWAY_URL=http://localhost:3000 GQL_ACCESS_TOKEN=afdb8b7e-8fa7-4de9-bd95-b650b839e745 PUBLIC_TEST_MODE=true VITE_TEST_MODE=true vite dev", + "dev:local-env": "GQL_URL=http://localhost:8080 MULTIPLAYER_API_URL=http://localhost:5002 MULTIPLAYER_API_ACCESS_TOKEN=1234 PUBLIC_PINATA_GATEWAY_URL=http://localhost:3000 GQL_ACCESS_TOKEN=afdb8b7e-8fa7-4de9-bd95-b650b839e745 PUBLIC_TEST_MODE=true VITE_TEST_MODE=true vite dev", "local-env:start": "docker compose -f ./docker/env.docker-compose.yml -f ./docker/env-ports-exposed.docker-compose.yml up --build --always-recreate-deps --force-recreate -V", "local-env:stop": "docker compose -f ./docker/env.docker-compose.yml -f ./docker/env-ports-exposed.docker-compose.yml down", "build": "vite build", - "build:e2e": "MULTIPLAYER_API_URL=http://multiplayer:5001 MULTIPLAYER_API_ACCESS_TOKEN=1234 GQL_URL=http://localhost:8080 PUBLIC_PINATA_GATEWAY_URL=http://localhost:3000 GQL_ACCESS_TOKEN=afdb8b7e-8fa7-4de9-bd95-b650b839e745 VITE_TEST_MODE=true npm run build", + "build:e2e": "MULTIPLAYER_API_URL=http://localhost:5002 MULTIPLAYER_API_ACCESS_TOKEN=1234 GQL_URL=http://localhost:8080 PUBLIC_PINATA_GATEWAY_URL=http://localhost:3000 GQL_ACCESS_TOKEN=afdb8b7e-8fa7-4de9-bd95-b650b839e745 VITE_TEST_MODE=true npm run build", "preview": "vite preview", - "test:e2e": "MULTIPLAYER_API_URL=http://multiplayer:5001 MULTIPLAYER_API_ACCESS_TOKEN=1234 PUBLIC_TEST_MODE=true vitest run e2e", + "test:e2e": "MULTIPLAYER_API_URL=http://localhost:5002 MULTIPLAYER_API_ACCESS_TOKEN=1234 PUBLIC_TEST_MODE=true vitest run e2e", "test:unit": "vitest run unit", "e2e": "docker compose -f ./docker/env.docker-compose.yml -f ./docker/app-e2e-test.docker-compose.yml up --build --attach app --exit-code-from app --abort-on-container-exit --always-recreate-deps --force-recreate -V", "coverage": "vitest run --coverage",