Hoist mock calls

.editorconfig

@@ -1,3 +1,7 @@
-[*.js]
+[*.ts]
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+[*.tsx]
+indent_style = space
+indent_size = 4

src/postprocess.ts

@@ -3,55 +3,57 @@
  * https://github.com/facebook/jest/blob/9b157c3a7c325c3971b2aabbe4c8ab4ce0b0c56d/packages/babel-jest/src/index.js
  */
 import * as jestPreset from 'babel-preset-jest';
-import { JestConfig, PostProcessHook, PostProcessorOptions, TransformOptions } from './jest-types';
+import {JestConfig, PostProcessHook, PostProcessorOptions, TransformOptions} from './jest-types';
 import * as babel from 'babel-core';
-import { CompilerOptions } from 'typescript/lib/typescript';
+import {CompilerOptions} from 'typescript/lib/typescript';
 
 function createBabelTransformer(options: PostProcessorOptions) {
-	options = {
-		...options,
-		plugins: (options && options.plugins) || [],
-		presets: ((options && options.presets) || []).concat([jestPreset]),
-		retainLines: true,
-	};
-	delete options.cacheDirectory;
-	delete options.filename;
+    options = {
+        ...options,
+        plugins: (options && options.plugins) || [],
+        presets: ((options && options.presets) || []).concat([jestPreset]),
+        retainLines: true,
+    };
+    delete options.cacheDirectory;
+    delete options.filename;
 
-	return (src: string,
-		filename: string,
-		config: JestConfig,
-		transformOptions: TransformOptions): string => {
-		const theseOptions = Object.assign({ filename }, options);
-		if (transformOptions && transformOptions.instrument) {
-			theseOptions.auxiliaryCommentBefore = ' istanbul ignore next ';
-			// Copied from jest-runtime transform.js
-			theseOptions.plugins = theseOptions.plugins.concat([
-				[
-					require('babel-plugin-istanbul').default,
-					{
-						// files outside `cwd` will not be instrumented
-						cwd: config.rootDir,
-						exclude: [],
-					},
-				],
-			]);
-		}
-		return babel.transform(src, theseOptions).code;
-	};
+    return (src: string,
+            filename: string,
+            config: JestConfig,
+            transformOptions: TransformOptions): string => {
+        const theseOptions = Object.assign({filename}, options);
+        if (transformOptions && transformOptions.instrument) {
+            theseOptions.auxiliaryCommentBefore = ' istanbul ignore next ';
+            // Copied from jest-runtime transform.js
+            theseOptions.plugins = theseOptions.plugins.concat([
+                [
+                    require('babel-plugin-istanbul').default,
+                    {
+                        // files outside `cwd` will not be instrumented
+                        cwd: config.rootDir,
+                        exclude: [],
+                    },
+                ],
+            ]);
+        }
+        return babel.transform(src, theseOptions).code;
+    };
 }
 
 export const getPostProcessHook = (tsCompilerOptions: CompilerOptions, jestConfig: JestConfig, tsJestConfig: any): PostProcessHook => {
-	if (tsJestConfig.skipBabel) {
-		return (src) => src; //Identity function
-	}
+    if (tsJestConfig.skipBabel) {
+        return (src) => src; //Identity function
+    }
 
-	//If we're not skipping babel
-	if (tsCompilerOptions.allowSyntheticDefaultImports) {
-		const plugins = ['transform-es2015-modules-commonjs'];
-		return createBabelTransformer({
-			presets: [],
-			plugins: plugins,
-		});
-	}
-	return (src) => src; //Identity function
+    const plugins = [];
+    //If we're not skipping babel
+    if (tsCompilerOptions.allowSyntheticDefaultImports) {
+        plugins.push('transform-es2015-modules-commonjs');
+    }
+
+
+    return createBabelTransformer({
+        presets: [],
+        plugins: plugins,
+    });
 };

tests/__tests__/__snapshots__/html-transform.spec.ts.snap

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`transforms html if config.globals.__TRANSFORM_HTML__ is set 1`] = `
+exports[`Html transforms transforms html if config.globals.__TRANSFORM_HTML__ is set 1`] = `
 "module.exports=\`<div class=\\"html-test\\">
   <span class=\\"html-test__element\\">This is element</span>
 </div>\`;"
 `;
 
-exports[`transforms html if config.globals.__TRANSFORM_HTML__ is set 2`] = `
+exports[`Html transforms transforms html if config.globals.__TRANSFORM_HTML__ is set 2`] = `
 "<div class=\\"html-test\\">
   <span class=\\"html-test__element\\">This is element</span>
 </div>"

tests/__tests__/html-transform.spec.ts

@@ -11,8 +11,10 @@ const config = {
   }
 };
 
-test('transforms html if config.globals.__TRANSFORM_HTML__ is set', () => {
-  expect(process(source, path, config)).toMatchSnapshot();
-  delete config.globals.__TRANSFORM_HTML__;
-  expect(process(source, path, config)).toMatchSnapshot();
-});
+describe('Html transforms', () => {
+  it('transforms html if config.globals.__TRANSFORM_HTML__ is set', () => {
+    expect(process(source, path, config)).toMatchSnapshot();
+    delete config.globals.__TRANSFORM_HTML__;
+    expect(process(source, path, config)).toMatchSnapshot();
+  });
+});

tests/__tests__/jest-hoist.spec.ts

@@ -0,0 +1,13 @@
+import runJest from '../__helpers__/runJest';
+
+describe('Jest.mock() calls', () => {
+
+    it('Should run all tests using jest.mock() underneath the imports succesfully.', () => {
+        const result = runJest('../hoist-test', ['--no-cache']);
+        const output = result.output.toString();
+
+        expect(output).toContain('4 passed, 4 total');
+        expect(result.status).toBe(0);
+    });
+
+});

tests/__tests__/ts-compilation.spec.ts

@@ -1,8 +1,8 @@
 import runJest from '../__helpers__/runJest';
 
-describe('hello_world', () => {
+describe('TS Compilation', () => {
 
-  it('should run successfully', () => {
+  it('should compile typescript succesfully', () => {
 
     const result = runJest('../simple', ['--no-cache']);
 
@@ -12,7 +12,7 @@ describe('hello_world', () => {
     expect(result.status).toBe(1);
     expect(output).toContain('1 failed, 1 total');
     expect(stderr).toContain('Hello Class');
-    expect(stderr).toContain('should throw an error on line 11');
+    expect(stderr).toContain('should throw an error on line 18');
 
   });
 

tests/__tests__/ts-coverage-async.spec.ts

@@ -1,8 +1,8 @@
 import runJest from '../__helpers__/runJest';
 
-describe('hello_world', () => {
+describe('Typescript async coverage', () => {
 
-  it('should run successfully', () => {
+  it('Should generate the correct async coverage numbers', () => {
     const result = runJest('../simple-async', ['--no-cache', '--coverage']);
 
     const output = result.stdout.toString();

tests/__tests__/ts-coverage.spec.ts

@@ -1,8 +1,8 @@
 import runJest from '../__helpers__/runJest';
 
-describe('hello_world', () => {
+describe('Typescript coverage', () => {
 
-  it('should run successfully', () => {
+  it('Should generate the correct coverage numbers.', () => {
     const result = runJest('../simple', ['--no-cache', '--coverage']);
 
     const output = result.stdout.toString();

tests/__tests__/ts-errors.spec.ts

@@ -1,6 +1,6 @@
 import runJest from '../__helpers__/runJest';
 
-describe('hello_world', () => {
+describe('Typescript errors', () => {
 
   it('should show the correct error locations in the typescript files', () => {
 
@@ -9,9 +9,20 @@ describe('hello_world', () => {
     const stderr = result.stderr.toString();
 
     expect(result.status).toBe(1);
-    expect(stderr).toContain('Hello.ts:13:11');
+    expect(stderr).toContain('Hello.ts:18:11');
     expect(stderr).toContain('Hello.test.ts:9:19');
 
   });
 
+    it('Should show the correct error locations in async typescript files', async () => {
+        const result = runJest('../simple-async', ['--no-cache']);
+
+        const stderr = result.stderr.toString();
+
+        expect(result.status).toBe(1);
+        expect(stderr).toContain('Hello.ts:13:11');
+        expect(stderr).toContain('Hello.test.ts:9:21');
+    });
+
+
 });

tests/__tests__/tsx-compilation.spec.ts

@@ -1,8 +1,8 @@
 import runJest from '../__helpers__/runJest';
 
-describe('button', () => {
+describe('TSX Compilation', () => {
 
-  it('should run successfully', () => {
+  it('Should compile a button succesfully', () => {
 
     const result = runJest('../button', ['--no-cache', '-u']);
 

tests/__tests__/tsx-errors.spec.ts

@@ -1,6 +1,6 @@
 import runJest from '../__helpers__/runJest';
 
-describe('button', () => {
+describe('TSX Errors', () => {
 
   it('should show the correct error locations in the typescript files', () => {
 
@@ -9,7 +9,7 @@ describe('button', () => {
     const stderr = result.stderr.toString();
 
     expect(result.status).toBe(1);
-    expect(stderr).toContain('Button.tsx:18:23');
+    expect(stderr).toContain('Button.tsx:18:17');
     expect(stderr).toContain('Button.test.tsx:15:12');
 
   });

tests/__tests__/watch.spec.ts

@@ -44,7 +44,7 @@ describe('Hello Class', () => {
 });
 `;
 
-describe('hello_world', () => {
+describe('Typescript watch tests', () => {
   let result: { childProcess: ChildProcess, getStderrAsync: () => Promise<string> };
   let DEFAULT_TIMEOUT_INTERVAL: number;
 

tests/hoist-test/__tests__/jest-hoist.test.ts

@@ -0,0 +1,27 @@
+
+import * as path from 'path';
+import {SomeClass, SomeFunctionDeclaredAsConst, SomeFunction} from '../src/things-to-mock';
+
+jest.mock('../src/things-to-mock');
+jest.mock('path');
+
+
+describe('Global mocks', () => {
+    it('A global var should be mocked when the jest.mock call is underneath', () => {
+        expect((path.basename as any).mock).toBeDefined();
+    });
+});
+
+describe('Local mocks', () => {
+    it('Jest should be able to mock a local class', () => {
+        expect((SomeClass as any).mockReturnValue).toBeDefined();
+    });
+
+    it('Jest should be able to mock a local class', () => {
+        expect((SomeFunction as any).mockReturnValueOnce).toBeDefined();
+    });
+
+    it('Jest should be able to mock a local class', () => {
+        expect((SomeFunctionDeclaredAsConst as any).mockImplementation).toBeDefined();
+    });
+});

tests/hoist-test/package.json

@@ -0,0 +1,14 @@
+{
+  "jest": {
+    "transform": {
+      ".(ts|tsx)": "../../preprocessor.js"
+    },
+    "moduleDirectories": ["node_modules", "src"],
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js"
+    ]
+  }
+}

tests/hoist-test/src/things-to-mock.ts

@@ -0,0 +1,10 @@
+
+
+export class SomeClass {
+}
+
+export const SomeFunctionDeclaredAsConst = () => 'originalValue';
+
+export function SomeFunction(){
+    return 'original';
+}

tests/hoist-test/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": false,
+    "jsx": "react",
+    "allowJs": true,
+    "baseUrl": "src",
+    "allowSyntheticDefaultImports": false
+  }
+}

tests/simple-async/__tests__/Hello.test.ts

@@ -4,7 +4,7 @@ import { Hello } from '../Hello';
 
 describe('Hello Class', () => {
 
-  it('should throw an error on line 11', () => {
+  it('should throw an error on line 13', () => {
     return new Promise((resolve: () => void) => {
       const hello = new Hello();
       resolve();

tests/simple/Hello.ts

@@ -1,3 +1,8 @@
+interface FooInterface {
+    foo: string,
+    bar: number, //This interface should be stripped and the line numbers should still fit.
+}
+
 export class Hello {
   constructor() {
     const greeting = `

tests/simple/__tests__/Hello.test.ts

@@ -4,7 +4,7 @@ import { Hello } from '../Hello';
 
 describe('Hello Class', () => {
 
-  it('should throw an error on line 11', () => {
+  it('should throw an error on line 18', () => {
 
     const hello = new Hello();