diff --git a/.gitignore b/.gitignore index 7423c47f81..3e6907b917 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ packages/react/build-storybook.log # Jest code coverage coverage/ -packages/server/coverage-seed/ # TypeScript incremental build tsconfig.tsbuildinfo diff --git a/packages/server/package.json b/packages/server/package.json index 4abc16f616..e6e71730ee 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -18,8 +18,8 @@ "clean": "rimraf dist", "dev": "ts-node-dev --poll --respawn --transpile-only --require ./src/otel/instrumentation.ts src/index.ts", "start": "node --require ./dist/otel/instrumentation.js dist/index.js", - "test:seed:serial": "jest seed-serial.test.ts --config jest.seed.config.ts --coverageDirectory \"/coverage-seed/serial\"", - "test:seed:parallel": "jest seed.test.ts --config jest.seed.config.ts --coverageDirectory \"/coverage-seed/parallel\"", + "test:seed:serial": "jest seed-serial.test.ts --config jest.seed.config.ts --coverageDirectory \"/coverage/seed/serial\"", + "test:seed:parallel": "jest seed.test.ts --config jest.seed.config.ts --coverageDirectory \"/coverage/seed/parallel\"", "test": "docker-compose -f ../../docker-compose.seed.yml up -d && npm run test:seed:parallel && jest" }, "dependencies": { diff --git a/scripts/test-main.sh b/scripts/test-main.sh index 24ceede2c6..69f874d95f 100755 --- a/scripts/test-main.sh +++ b/scripts/test-main.sh @@ -8,7 +8,7 @@ set -x # Seed the database before testing # This is the parallel implementation so it's faster time npx turbo run test:seed:parallel --filter=./packages/server -- --coverage -cp "packages/server/coverage-seed/parallel/coverage-final.json" "coverage/packages/coverage-server-seed-parallel.json" +cp "packages/server/coverage/seed/parallel/coverage-final.json" "coverage/packages/coverage-server-seed-parallel.json" # Test # Run them separately because code coverage is resource intensive diff --git a/scripts/test-seed.sh b/scripts/test-seed.sh index 29ec3ebf47..31757b8fa5 100755 --- a/scripts/test-seed.sh +++ b/scripts/test-seed.sh @@ -10,4 +10,4 @@ set -x # On a normal developer machine, this is run only rarely when setting up a new database # We execute this in parallel with the main line of tests time npx turbo run test:seed:serial --filter=./packages/server -- --coverage -cp "packages/server/coverage-seed/serial/coverage-final.json" "coverage/packages/coverage-server-seed-serial.json" +cp "packages/server/coverage/seed/serial/coverage-final.json" "coverage/packages/coverage-server-seed-serial.json" diff --git a/scripts/test.sh b/scripts/test.sh index 72a64ac8f2..8377396956 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -11,11 +11,10 @@ export NODE_OPTIONS='--max-old-space-size=8192' # Clear old code coverage data rm -rf coverage -rm -rf coverage-seed mkdir -p coverage/packages mkdir -p coverage/combined -mkdir -p coverage-seed/serial -mkdir -p coverage-seed/parallel +mkdir -p coverage/seed/serial +mkdir -p coverage/seed/parallel npx concurrently -n seed,main --kill-others-on-fail "scripts/test-seed.sh" "scripts/test-main.sh"