test: coverage

Author: huafu

e2e/__helpers__/test-case.ts

@@ -370,7 +370,7 @@ function prepareTest(
   fs.outputFileSync(join(caseWorkdir, '__eval.ts'), EVAL_SOURCE, 'utf8');
   let ioDir!: string;
   if (options.writeIo) {
-    ioDir = join(caseWorkdir, '__io');
+    ioDir = join(caseWorkdir, '__io__');
     fs.mkdirpSync(ioDir);
   }
   const hooksFile = join(caseWorkdir, '__hooks.js');

e2e/jest.config.js

@@ -1,8 +1,10 @@
-const base = require('../jest.config');
-
-module.exports = Object.assign({}, base, {
-  rootDir: '.',
-  testRegex: '/__tests__/.+\\.(test|spec)\\.ts$',
-  coverageDirectory: '<rootDir>/../coverage/e2e',
-  snapshotSerializers: ['<rootDir>/__serializers__/test-run-result.ts'],
-});
+module.exports = {
+  rootDir: '..',
+  transform: {
+    '\\.ts$': '<rootDir>/dist/index.js',
+  },
+  testMatch: ['<rootDir>/e2e/__tests__/**/?(*.)+(spec|test).ts?(x)'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+  testEnvironment: 'node',
+  snapshotSerializers: ['<rootDir>/e2e/__serializers__/test-run-result.ts'],
+};

jest.config.js

@@ -1,15 +1,14 @@
 module.exports = {
-  rootDir: 'src',
+  rootDir: '.',
   transform: {
-    '\\.ts$': '<rootDir>/../dist/index.js',
+    '\\.ts$': '<rootDir>/dist/index.js',
   },
-  testRegex: '\\.(spec|test)\\.ts$',
-  coverageDirectory: '<rootDir>/../coverage/unit',
+  testMatch: ['<rootDir>/src/**/?(*.)+(spec|test).ts?(x)'],
   collectCoverageFrom: [
-    '<rootDir>/../src/**/*.ts',
-    '!<rootDir>/../src/**/*.spec.ts',
-    '!<rootDir>/../src/**/*.test.ts',
-    '!<rootDir>/../src/**/__*__/',
+    '<rootDir>/src/**/*.ts',
+    '!<rootDir>/src/**/*.spec.ts',
+    '!<rootDir>/src/**/*.test.ts',
+    '!<rootDir>/src/**/__*__/*',
   ],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
   testEnvironment: 'node',

package.json

@@ -10,7 +10,7 @@
     "build:watch": "tsc -p tsconfig.build.json -w",
     "clean": "node scripts/clean.js",
     "pretest": "npm run lint",
-    "test": "run-s -s \"test:e2e -- {@}\" \"test:unit -- {@}\" --",
+    "test": "run-s -s test:e2e \"test:unit -- {@}\" --",
     "test:e2e": "node scripts/e2e.js",
     "test:unit": "jest",
     "lint": "tslint --project .",

scripts/e2e.js

@@ -15,6 +15,15 @@ const npmVersion = spawnSync('npm', ['-s', '--version'])
 const npmHasCiCommand = satisfies(npmVersion, '>=5.7.0');
 const npmHasPrepare = satisfies(npmVersion, '>=4.0.0');
 
+const configFile = path.resolve(__dirname, '..', 'e2e', 'jest.config.js');
+let parentArgs = process.argv.slice(2);
+if (parentArgs.includes('--coverage')) {
+  console.warn(
+    'Coverages cannot be activated for e2e tests (but can in each e2e test).'
+  );
+  parentArgs = parentArgs.filter(a => a !== '--coverage');
+}
+
 function getDirectories(rootDir) {
   return fs.readdirSync(rootDir).filter(function(file) {
     return fs.statSync(path.join(rootDir, file)).isDirectory();
@@ -135,12 +144,14 @@ function setupE2e() {
   });
 }
 
+// ============================================================================
+
 setupE2e();
 
-log('templates are ready, running tests', '\n\n');
+log('templates are ready, clearing Jest cache');
+
+spawnSync('jest', ['--clearCache']);
+
+log('running tests');
 
-jest.run([
-  '--config',
-  path.resolve(__dirname, '..', 'e2e', 'jest.config.js'),
-  ...process.argv.slice(2),
-]);
+jest.run(['--config', configFile, ...parentArgs]);

tsconfig.json

@@ -19,7 +19,6 @@
     "resolveJsonModule": true,
     "lib": ["es2015", "es2016.array.include"],
     "types": ["jest", "node"],
-    "sourceRoot": "src"
   },
   "include": [
     "src",