Skip to content

Commit

Permalink
cleanup(coverage): coverage/seed/{parallel,serial}
Browse files Browse the repository at this point in the history
  • Loading branch information
ThatOneBro committed Apr 23, 2024
1 parent 50f312b commit 40a0941
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ packages/react/build-storybook.log

# Jest code coverage
coverage/
packages/server/coverage-seed/

# TypeScript incremental build
tsconfig.tsbuildinfo
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 \"<rootDir>/coverage-seed/serial\"",
"test:seed:parallel": "jest seed.test.ts --config jest.seed.config.ts --coverageDirectory \"<rootDir>/coverage-seed/parallel\"",
"test:seed:serial": "jest seed-serial.test.ts --config jest.seed.config.ts --coverageDirectory \"<rootDir>/coverage/seed/serial\"",
"test:seed:parallel": "jest seed.test.ts --config jest.seed.config.ts --coverageDirectory \"<rootDir>/coverage/seed/parallel\"",
"test": "docker-compose -f ../../docker-compose.seed.yml up -d && npm run test:seed:parallel && jest"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-seed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 2 additions & 3 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 40a0941

Please sign in to comment.