Skip to content

Commit d8c2629

Browse files
author
Jason Kuhrt
authored
test: enable coverage reporting (prisma#3848)
1 parent ccfe3b5 commit d8c2629

File tree

19 files changed

+154
-47
lines changed

19 files changed

+154
-47
lines changed

‎.github/workflows/test.yml

+41-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# CLI-INTEGRATION
3737
#
3838
cli-integration:
39-
timeout-minutes: 8
39+
timeout-minutes: 10
4040
runs-on: ubuntu-latest
4141

4242
strategy:
@@ -181,7 +181,7 @@ jobs:
181181
# CLIENT
182182
#
183183
client:
184-
timeout-minutes: 7
184+
timeout-minutes: 20
185185
runs-on: ubuntu-latest
186186

187187
strategy:
@@ -250,6 +250,11 @@ jobs:
250250
TEST_POSTGRES_URI: postgres://prisma:prisma@localhost:${{ job.services.postgres.ports[5432] }}/tests
251251
TEST_MYSQL_URI: mysql://root:root@localhost:${{ job.services.mysql.ports[3306] }}/tests
252252

253+
- name: Upload coverage report
254+
working-directory: src/packages/client
255+
run: |
256+
bash <(curl -s https://codecov.io/bash) -F client -f ./src/__tests__/coverage/clover.xml
257+
253258
#
254259
# SDK
255260
#
@@ -296,6 +301,11 @@ jobs:
296301
SKIP_GIT: true
297302
GITHUB_CONTEXT: ${{ toJson(github) }}
298303

304+
- name: Upload coverage report
305+
working-directory: src/packages/sdk
306+
run: |
307+
bash <(curl -s https://codecov.io/bash) -F sdk -f ./src/__tests__/coverage/clover.xml
308+
299309
#
300310
# MIGRATE
301311
#
@@ -345,6 +355,11 @@ jobs:
345355
SKIP_GIT: true
346356
GITHUB_CONTEXT: ${{ toJson(github) }}
347357

358+
- name: Upload coverage report
359+
working-directory: src/packages/migrate
360+
run: |
361+
bash <(curl -s https://codecov.io/bash) -F migrate -f ./src/__tests__/coverage/clover.xml
362+
348363
#
349364
# INTROSPECTION
350365
#
@@ -403,6 +418,10 @@ jobs:
403418
GITHUB_CONTEXT: ${{ toJson(github) }}
404419
TEST_POSTGRES_URI: postgres://prisma:prisma@localhost:${{ job.services.postgres.ports[5432] }}/tests
405420

421+
- name: Upload coverage report
422+
working-directory: src/packages/introspection
423+
run: |
424+
bash <(curl -s https://codecov.io/bash) -F introspection -f ./src/__tests__/coverage/clover.xml
406425
#
407426
# All the other packages!
408427
#
@@ -449,6 +468,10 @@ jobs:
449468
CI: true
450469
SKIP_GIT: true
451470
GITHUB_CONTEXT: ${{ toJson(github) }}
471+
- name: Upload coverage report
472+
working-directory: src/packages/debug
473+
run: |
474+
bash <(curl -s https://codecov.io/bash) -F debug -f ./src/__tests__/coverage/clover.xml
452475
453476
- run: pnpm run test
454477
name: 'engine-core'
@@ -457,6 +480,10 @@ jobs:
457480
CI: true
458481
SKIP_GIT: true
459482
GITHUB_CONTEXT: ${{ toJson(github) }}
483+
- name: Upload coverage report
484+
working-directory: src/packages/engine-core
485+
run: |
486+
bash <(curl -s https://codecov.io/bash) -F engine-core -f ./src/__tests__/coverage/clover.xml
460487
461488
- run: pnpm run test
462489
name: 'fetch-engine'
@@ -465,6 +492,10 @@ jobs:
465492
CI: true
466493
SKIP_GIT: true
467494
GITHUB_CONTEXT: ${{ toJson(github) }}
495+
- name: Upload coverage report
496+
working-directory: src/packages/fetch-engine
497+
run: |
498+
bash <(curl -s https://codecov.io/bash) -F fetch-engine -f ./src/__tests__/coverage/clover.xml
468499
469500
- run: pnpm run test
470501
name: 'generator-helper'
@@ -473,6 +504,10 @@ jobs:
473504
CI: true
474505
SKIP_GIT: true
475506
GITHUB_CONTEXT: ${{ toJson(github) }}
507+
- name: Upload coverage report
508+
working-directory: src/packages/generator-helper
509+
run: |
510+
bash <(curl -s https://codecov.io/bash) -F generator-helper -f ./src/__tests__/coverage/clover.xml
476511
477512
- run: pnpm run test
478513
name: 'get-platform'
@@ -481,3 +516,7 @@ jobs:
481516
CI: true
482517
SKIP_GIT: true
483518
GITHUB_CONTEXT: ${{ toJson(github) }}
519+
- name: Upload coverage report
520+
working-directory: src/packages/get-platform
521+
run: |
522+
bash <(curl -s https://codecov.io/bash) -F get-platform -f ./src/__tests__/coverage/clover.xml

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ dist/
1818
.pnpm-store
1919

2020
.vscode
21+
coverage

‎codecov.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Disable PR comments until we are proud and willing to have
2+
# the results be more public
3+
comment: false
4+
5+
flags:
6+
get-platform:
7+
carryforward: true
8+
paths:
9+
- src/packages/get-platform/
10+
fetch-engine:
11+
carryforward: true
12+
paths:
13+
- src/packages/fetch-engine/
14+
client:
15+
carryforward: true
16+
paths:
17+
- src/packages/client/
18+
debug:
19+
carryforward: true
20+
paths:
21+
- src/packages/debug/
22+
engine-core:
23+
carryforward: true
24+
paths:
25+
- src/packages/engine-core/
26+
generator-helper:
27+
carryforward: true
28+
paths:
29+
- src/packages/generator-helper/
30+
sdk:
31+
carryforward: true
32+
paths:
33+
- src/packages/sdk/
34+
introspection:
35+
carryforward: true
36+
paths:
37+
- src/packages/introspection/

‎src/packages/cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"prisma2": "build/index.js"
6060
},
6161
"prisma": {
62-
"version": "f4f4c265b355e72ab29dbb1d4495d4bcaf0e829f",
62+
"version": "c4a65524ad3e8b18e8ea0c41a718819b4cd42ee4",
6363
"prismaCommit": "dfe0f7d2a35aec8a2663fda201200f23f057343d"
6464
},
6565
"devDependencies": {
@@ -162,4 +162,4 @@
162162
"eslint"
163163
]
164164
}
165-
}
165+
}

‎src/packages/client/jest.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4+
collectCoverage: true,
5+
coverageDirectory: 'src/__tests__/coverage',
46
modulePathIgnorePatterns: [
57
'build/',
68
'dist/',
@@ -12,13 +14,13 @@ module.exports = {
1214
'stack.js',
1315
'runner.js',
1416
'node_modules/',
15-
'exhaustive-schema/generated-dmmf.ts'
17+
'exhaustive-schema/generated-dmmf.ts',
1618
],
1719
globals: {
1820
'ts-jest': {
1921
packageJson: 'package.json',
2022
},
2123
},
2224
snapshotSerializers: ['./helpers/jestSnapshotSerializer'],
23-
testTimeout: 10000
25+
testTimeout: 10000,
2426
}

‎src/packages/client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"prepublishOnly": "pnpm run build"
4949
},
5050
"prisma": {
51-
"version": "f4f4c265b355e72ab29dbb1d4495d4bcaf0e829f"
51+
"version": "c4a65524ad3e8b18e8ea0c41a718819b4cd42ee4"
5252
},
5353
"files": [
5454
"runtime",

‎src/packages/debug/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: ['build/', 'dist/', 'generator/', 'runtime/'],
4+
collectCoverage: true,
5+
coverageDirectory: 'src/__tests__/coverage',
6+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
7+
testMatch: ['**/src/__tests__/**/*.test.ts'],
58
globals: {
69
'ts-jest': {
710
packageJson: 'package.json',

‎src/packages/engine-core/jest.config.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: [
5-
'build/',
6-
'dist/',
7-
'generator/',
8-
'runtime/',
9-
'scripts/',
10-
'sandbox/',
11-
],
4+
collectCoverage: true,
5+
coverageDirectory: 'src/__tests__/coverage',
6+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
7+
testMatch: ['**/src/__tests__/**/*.test.ts'],
128
globals: {
139
'ts-jest': {
1410
packageJson: 'package.json',

‎src/packages/fetch-engine/jest.config.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: [
5-
'build/',
6-
'dist/',
7-
'generator/',
8-
'runtime/',
9-
'scripts/',
10-
'sandbox/',
11-
],
4+
collectCoverage: true,
5+
coverageDirectory: 'src/__tests__/coverage',
6+
testMatch: ['**/src/__tests__/**/*.test.ts'],
7+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
128
globals: {
139
'ts-jest': {
1410
packageJson: 'package.json',

‎src/packages/generator-helper/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: ['build/', 'dist/', 'generator/', 'runtime/'],
4+
testMatch: ['**/src/__tests__/**/*.test.ts'],
5+
collectCoverage: true,
6+
coverageDirectory: 'src/__tests__/coverage',
7+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
58
globals: {
69
'ts-jest': {
710
packageJson: 'package.json',

‎src/packages/get-platform/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: ['build/', 'dist/', 'generator/', 'runtime/'],
4+
collectCoverage: true,
5+
coverageDirectory: 'src/__tests__/coverage',
6+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
7+
testMatch: ['**/src/__tests__/**/*.test.ts'],
58
globals: {
69
'ts-jest': {
710
packageJson: 'package.json',

‎src/packages/get-platform/src/__tests__/parseDistro.ts renamed to ‎src/packages/get-platform/src/__tests__/parseDistro.test.ts

File renamed without changes.

‎src/packages/get-platform/src/__tests__/parseOpenSSLVersion.ts renamed to ‎src/packages/get-platform/src/__tests__/parseOpenSSLVersion.test.ts

File renamed without changes.

‎src/packages/introspection/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: ['build/', 'dist/'],
4+
testMatch: ['**/src/__tests__/**/*.test.ts'],
5+
collectCoverage: true,
6+
coverageDirectory: 'src/__tests__/coverage',
7+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
58
globals: {
69
'ts-jest': {
710
packageJson: 'package.json',

‎src/packages/migrate/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: ['dist/', 'fixtures/', '__helpers__/'],
4+
testMatch: ['**/src/__tests__/**/*.test.ts'],
5+
collectCoverage: true,
6+
coverageDirectory: 'src/__tests__/coverage',
7+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
58
// todo duplicated serializer from client package, should share
69
snapshotSerializers: ['./src/__tests__/__helpers__/snapshotSerializer.ts'],
710
globals: {

‎src/packages/sdk/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
4-
modulePathIgnorePatterns: ['build/', 'dist/', 'generator/', 'runtime/'],
4+
testMatch: ['**/src/__tests__/**/*.test.ts'],
5+
collectCoverage: true,
6+
coverageDirectory: 'src/__tests__/coverage',
7+
collectCoverageFrom: ['src/**/*.ts', '!**/__tests__/**/*'],
58
globals: {
69
'ts-jest': {
710
packageJson: 'package.json',

‎src/packages/sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"scripts"
2222
],
2323
"prisma": {
24-
"version": "f4f4c265b355e72ab29dbb1d4495d4bcaf0e829f"
24+
"version": "c4a65524ad3e8b18e8ea0c41a718819b4cd42ee4"
2525
},
2626
"devDependencies": {
2727
"@types/jest": "26.0.14",

‎src/packages/sdk/src/__tests__/getGenerators/getGenerators.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import path from 'path'
22
import { getGenerators } from '../../getGenerators'
3-
import { pick } from '../../pick'
43
import { omit } from '../../omit'
4+
import { pick } from '../../pick'
55

6-
jest.setTimeout(10000)
6+
jest.setTimeout(20000)
77

88
describe('getGenerators', () => {
99
test('basic', async () => {

0 commit comments

Comments
 (0)