fix: fixes coverage and tests

kulshekhar · Jul 19, 2018 · 09500c2 · 09500c2
1 parent e46caae
commit 09500c2
Show file tree

Hide file tree

Showing 36 changed files with 85 additions and 147 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "build:watch": "tsc -p tsconfig.build.json -w",
-    "test:nolint": "npm run clean-build && node scripts/tests.js",
+    "test:nolint": "npm run clean-build && jest --clearCache && node scripts/tests.js",
     "clean": "rimraf dist/**/* && rimraf tests/*/coverage && rimraf tests/*/debug.txt && rimraf tests/*/node_modules",
     "clean-build": "npm run clean && npm run build",
     "pretest": "npm run tslint && npm run clean-build",

diff --git a/src/index.ts b/src/index.ts
@@ -31,5 +31,6 @@ const createTransformer = (options?: any): jest.Transformer => {
   };
 };
 
-export default createTransformer();
-export { createTransformer };
+const mod = createTransformer();
+mod.createTransformer = createTransformer;
+export = mod;
diff --git a/src/utils/get-cache-key.ts b/src/utils/get-cache-key.ts
@@ -9,7 +9,12 @@ export default function getCacheKey(
   args: JestCacheKeyArguments,
   ctx: TsJestContext,
 ): string {
-  const [fileData, filePath, jestConfigString, { instrument, rootDir }] = args;
+  const [
+    fileData,
+    filePath,
+    jestConfigString,
+    { instrument = false, rootDir = process.cwd() } = {},
+  ] = args;
   const glob = JSON.parse(jestConfigString).globals || {};
   return createHash('md5')
     .update(MY_PACKAGE_CONTENT)

diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -31,7 +31,7 @@ export function flushLogs(): void {
     return; // only output stuff for the first invocation and if logging is enabled.
   }
   logsFlushed = true;
-  const rootPath = path.resolve(__dirname, '../');
+  const rootPath = path.resolve(__dirname, '..', '..');
   const JSONifiedLogs = logs.map(convertToJSONIfPossible);
   const logString = JSONifiedLogs.join('\n');
   const filePath = path.resolve(rootPath, 'debug.txt');

diff --git a/tests/__tests__/__snapshots__/ts-coverage-async.spec.ts.snap b/tests/__tests__/__snapshots__/ts-coverage-async.spec.ts.snap
@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Typescript async coverage Should generate the correct async coverage numbers 1`] = `
+"
+=============================== Coverage summary ===============================
+Statements   : 68.75% ( 11/16 )
+Branches     : 33.33% ( 2/6 )
+Functions    : 66.67% ( 4/6 )
+Lines        : 73.33% ( 11/15 )
+================================================================================
+"
+`;
diff --git a/tests/__tests__/__snapshots__/ts-coverage.spec.ts.snap b/tests/__tests__/__snapshots__/ts-coverage.spec.ts.snap
@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Typescript coverage Should generate the correct coverage numbers. 1`] = `
+"
+=============================== Coverage summary ===============================
+Statements   : 68.75% ( 11/16 )
+Branches     : 33.33% ( 2/6 )
+Functions    : 66.67% ( 4/6 )
+Lines        : 73.33% ( 11/15 )
+================================================================================
+"
+`;
diff --git a/tests/__tests__/html-transform.spec.ts b/tests/__tests__/html-transform.spec.ts
@@ -1,7 +1,7 @@
-import { process } from '../../src/preprocessor';
+import * as tsJest from '../..';
 
 const path = '/path/to/file.html';
-const config = { globals: {} as any };
+const config: jest.ProjectConfig = { globals: {} } as any;
 // wrap a transformed source so that we can fake a `require()` on it by calling the returned wrapper
 const wrap = (src: string) =>
   new Function(`var module={}; ${src} return module.exports;`) as any;
@@ -14,10 +14,10 @@ const source = `<div class="html-test">
 describe('Html transforms', () => {
   it('transforms html if config.globals.__TRANSFORM_HTML__ is set', () => {
     // get the untransformed version
-    const untransformed = process(source, path, config);
+    const untransformed = tsJest.process(source, path, config);
     // ... then the one which should be transformed
-    config.globals.__TRANSFORM_HTML__ = true;
-    const transformed = process(source, path, config) as string;
+    (config.globals as any).__TRANSFORM_HTML__ = true;
+    const transformed = tsJest.process(source, path, config) as string;
     // ... finally the result of a `require('module-with-transformed-version')`
     const exported = wrap(transformed)();
 

diff --git a/tests/__tests__/postprocess.spec.ts b/tests/__tests__/postprocess.spec.ts
@@ -9,13 +9,18 @@ jest.mock('@babel/core', () => {
 import { getPostProcessHook } from '../../src/postprocess';
 
 describe('postprocess', () => {
-  function runHook(tsCompilerOptions = {}, jestConfig = {}, tsJestConfig = {}) {
-    return getPostProcessHook(tsCompilerOptions, jestConfig, tsJestConfig)(
-      { code: 'input_code', map: 'input_source_map' },
-      'fake_file',
-      {},
-      { instrument: null },
-    );
+  function runHook(
+    tsCompilerOptions = {},
+    jestConfig: Partial<jest.ProjectConfig> = {},
+    tsJestConfig = {},
+  ) {
+    return getPostProcessHook(
+      tsCompilerOptions,
+      jestConfig as any,
+      tsJestConfig,
+    )({ code: 'input_code', map: 'input_source_map' }, 'fake_file', {} as any, {
+      instrument: null,
+    });
   }
 
   it('skips postprocess when skipBabel=true', () => {
@@ -29,10 +34,10 @@ describe('postprocess', () => {
     const transformMock = require.requireMock('@babel/core').transform;
 
     runHook();
-    getPostProcessHook({}, {}, {})(
+    getPostProcessHook({}, {} as any, {})(
       { code: 'input_code', map: 'input_source_map' },
       'fake_file',
-      {},
+      {} as any,
       { instrument: null },
     );
     expect(transformMock).lastCalledWith(

diff --git a/tests/__tests__/transpile-if-ts.spec.ts b/tests/__tests__/transpile-if-ts.spec.ts
diff --git a/tests/__tests__/ts-coverage-async.spec.ts b/tests/__tests__/ts-coverage-async.spec.ts
@@ -6,9 +6,6 @@ describe('Typescript async coverage', () => {
 
     const output = result.stdout;
 
-    expect(output).toContain('Statements   : 71.43% ( 10/14 )');
-    expect(output).toContain('Branches     : 33.33% ( 2/6 )');
-    expect(output).toContain('Functions    : 66.67% ( 4/6 )');
-    expect(output).toContain('Lines        : 66.67% ( 8/12 )');
+    expect(output).toMatchSnapshot();
   });
 });
diff --git a/tests/__tests__/ts-coverage.spec.ts b/tests/__tests__/ts-coverage.spec.ts
@@ -6,9 +6,6 @@ describe('Typescript coverage', () => {
 
     const output = result.stdout;
 
-    expect(output).toContain('Statements   : 71.43% ( 10/14 )');
-    expect(output).toContain('Branches     : 33.33% ( 2/6 )');
-    expect(output).toContain('Functions    : 66.67% ( 4/6 )');
-    expect(output).toContain('Lines        : 66.67% ( 8/12 )');
+    expect(output).toMatchSnapshot();
   });
 });
diff --git a/tests/button/package.json b/tests/button/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "moduleFileExtensions": [

diff --git a/tests/coverage-simple/.gitignore b/tests/coverage-simple/.gitignore
diff --git a/tests/coverage-simple/Hello.ts b/tests/coverage-simple/Hello.ts
diff --git a/tests/coverage-simple/NullCoverage.js b/tests/coverage-simple/NullCoverage.js
diff --git a/tests/coverage-simple/__tests__/Hello.test.ts b/tests/coverage-simple/__tests__/Hello.test.ts
diff --git a/tests/coverage-simple/package.json b/tests/coverage-simple/package.json
diff --git a/tests/coverage-simple/tsconfig.json b/tests/coverage-simple/tsconfig.json
diff --git a/tests/coverage-simple/yarn.lock b/tests/coverage-simple/yarn.lock
diff --git a/tests/dynamic-imports/jest.allowdefaultimports.json b/tests/dynamic-imports/jest.allowdefaultimports.json
@@ -6,7 +6,7 @@
     }
   },
   "transform": {
-    "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
   },
   "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
   "moduleFileExtensions": [

diff --git a/tests/dynamic-imports/package.json b/tests/dynamic-imports/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "moduleFileExtensions": [

diff --git a/tests/hoist-errors/package.json b/tests/hoist-errors/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "coverageReporters": [

diff --git a/tests/hoist-test/package.json b/tests/hoist-test/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "moduleDirectories": ["node_modules", "src"],
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",

diff --git a/tests/imports-test/package.json b/tests/imports-test/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "moduleDirectories": [
       "node_modules",

diff --git a/tests/metadata-emit/package.json b/tests/metadata-emit/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "moduleDirectories": ["node_modules", "src"],
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",

diff --git a/tests/no-synthetic-default/package.json b/tests/no-synthetic-default/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "moduleDirectories": ["node_modules", "src"],
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",

diff --git a/tests/simple-async/package.json b/tests/simple-async/package.json
@@ -2,7 +2,7 @@
   "jest": {
     "rootDir": "./",
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "coverageReporters": [

diff --git a/tests/simple-long-path/package.json b/tests/simple-long-path/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "coverageReporters": [

diff --git a/tests/skip-babelrc/package.json b/tests/skip-babelrc/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "coverageReporters": [

diff --git a/tests/synthetic-default/package.json b/tests/synthetic-default/package.json
@@ -1,7 +1,7 @@
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
     },
     "moduleDirectories": [
       "node_modules",

diff --git a/tests/ts-diagnostics/package.json b/tests/ts-diagnostics/package.json
@@ -1,7 +1,7 @@
 {
 	"jest": {
 		"transform": {
-			"^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+			"^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/dist/index.js"
 		},
 		"moduleDirectories": [
 			"node_modules",

diff --git a/tests/ts-jest-module-interface/__tests__/ts-jest-module-interface.test.ts b/tests/ts-jest-module-interface/__tests__/ts-jest-module-interface.test.ts
@@ -1,4 +1,4 @@
-import * as tsJest from 'ts-jest';
+import * as tsJest from '../../..';
 
 describe('ts-jest module interface', () => {
   it('is an object', () => {
@@ -10,4 +10,10 @@ describe('ts-jest module interface', () => {
   it('has a getCacheKey function', () => {
     expect(typeof tsJest.getCacheKey).toBe('function');
   });
+  it('has a canInstrument property', () => {
+    expect(tsJest).toHaveProperty('canInstrument', true);
+  });
+  it('has a createTransformer function', () => {
+    expect(typeof tsJest.createTransformer).toBe('function');
+  });
 });