Unique coverage file names

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
elastic · Dec 23, 2020 · 5070786 · 5070786
1 parent 9c44d09
commit 5070786
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.ci/teamcity/tests/jest.sh b/.ci/teamcity/tests/jest.sh
@@ -7,4 +7,4 @@ source "$(dirname "${0}")/../util.sh"
 export JOB=kibana-jest
 
 checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --verbose --maxWorkers=10 --coverage --coverageReporters json
+  node scripts/jest --ci --verbose --maxWorkers=10 --coverage
diff --git a/.ci/teamcity/tests/jest_integration.sh b/.ci/teamcity/tests/jest_integration.sh
@@ -7,4 +7,4 @@ source "$(dirname "${0}")/../util.sh"
 export JOB=kibana-jest-integration
 
 checks-reporter-with-killswitch "Jest Integration Tests" \
-  node --expose-gc scripts/jest_integration --logHeapUsage --ci --verbose --coverage --coverageReporters json
+  node --expose-gc scripts/jest_integration --logHeapUsage --ci --verbose --coverage
diff --git a/jest.config.integration.js b/jest.config.integration.js
@@ -28,13 +28,15 @@ module.exports = {
   testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
     (pattern) => !pattern.includes('integration_tests')
   ),
+  setupFilesAfterEnv: ['<rootDir>/packages/kbn-test/target/jest/setup/after_env.integration.js'],
   reporters: [
     'default',
     [
       '<rootDir>/packages/kbn-test/target/jest/junit_reporter',
       { reportName: 'Jest Integration Tests' },
     ],
   ],
-  setupFilesAfterEnv: ['<rootDir>/packages/kbn-test/target/jest/setup/after_env.integration.js'],
-  coverageDirectory: '<rootDir>/target/jest-coverage/jest_integration',
+  coverageReporters: !!process.env.CI
+    ? [['json', { file: 'jest-integration.json' }]]
+    : ['html', 'text'],
 };
diff --git a/packages/kbn-test/jest-preset.js b/packages/kbn-test/jest-preset.js
@@ -30,7 +30,7 @@ module.exports = {
   coveragePathIgnorePatterns: ['/node_modules/', '.*\\.d\\.ts'],
 
   // A list of reporter names that Jest uses when writing coverage reports
-  coverageReporters: ['html', 'text'],
+  coverageReporters: !!process.env.CI ? [['json', { file: 'jest.json' }]] : ['html', 'text'],
 
   // An array of file extensions your modules use
   moduleFileExtensions: ['js', 'mjs', 'json', 'ts', 'tsx', 'node'],

diff --git a/test/scripts/test/jest_integration.sh b/test/scripts/test/jest_integration.sh
@@ -3,4 +3,4 @@
 source src/dev/ci_setup/setup_env.sh
 
 checks-reporter-with-killswitch "Jest Integration Tests" \
-  node --expose-gc scripts/jest_integration --logHeapUsage --ci --verbose --coverage --coverageReporters json
+  node --expose-gc scripts/jest_integration --logHeapUsage --ci --verbose --coverage
diff --git a/test/scripts/test/jest_unit.sh b/test/scripts/test/jest_unit.sh
@@ -3,4 +3,4 @@
 source src/dev/ci_setup/setup_env.sh
 
 checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --verbose --maxWorkers=10 --coverage --coverageReporters json
+  node scripts/jest --ci --verbose --maxWorkers=10 --coverage