fix: typos + node 6 compat

kulshekhar · Aug 13, 2018 · 0ed1587 · 0ed1587
1 parent cbaddc3
commit 0ed1587
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -102,7 +102,7 @@ import * as React from 'react';
 //Synthetic default imports:
 import React from 'react';
 ```
-ts-jest tries to support that by using TypeScript 2.7+ built-in support for this feature via the `esModuleInterop` option. More details [here](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html)** 
+ts-jest does that by using TypeScript 2.7+ `esModuleInterop` option. More details [here](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html). 
 
 ### Supports automatic of jest.mock() calls
 [Just like Jest](https://facebook.github.io/jest/docs/manual-mocks.html#using-with-es-module-imports) ts-jest

diff --git a/e2e/__templates__/with-jest-22/jest.config.js b/e2e/__templates__/with-jest-22/jest.config.js
@@ -1,7 +1,6 @@
 const { jestPreset } = require('ts-jest');
 
-module.exports = {
-  ...jestPreset,
+module.exports = Object.assign({}, jestPreset, {
   testEnvironment: 'node',
   globals: { 'ts-jest': { tsConfig: {} } },
-};
+});