fix(testing): merge rather than replace ts-jest property on global …

…config resolves #1059
nrwl · Sep 29, 2019 · 995ffeb · 995ffeb
1 parent 579a155
commit 995ffeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/jest/src/builders/jest/jest.impl.spec.ts b/packages/jest/src/builders/jest/jest.impl.spec.ts
@@ -277,7 +277,7 @@ describe('Jest Builder', () => {
     beforeAll(() => {
       jest.doMock(
         '/root/jest.config.js',
-        () => ({ globals: { hereToStay: true } }),
+        () => ({ globals: { hereToStay: true, 'ts-jest': { diagnostics: false } } }),
         { virtual: true }
       );
     });
@@ -296,6 +296,7 @@ describe('Jest Builder', () => {
           globals: JSON.stringify({
             hereToStay: true,
             'ts-jest': {
+              diagnostics: false,
               tsConfig: '/root/tsconfig.test.json',
               stringifyContentPathRegex: '\\.(html|svg)$',
               astTransformers: [

diff --git a/packages/jest/src/builders/jest/jest.impl.ts b/packages/jest/src/builders/jest/jest.impl.ts
@@ -76,7 +76,10 @@ function run(
   const jestConfig: { globals: any } = require(options.jestConfig);
   const globals = jestConfig.globals || {};
   Object.assign(globals, {
-    'ts-jest': tsJestConfig
+    'ts-jest': {
+      ...(globals['ts-jest'] || {}),
+      ...tsJestConfig
+    }
   });
 
   const config: any = {