fix(repo): fix test

nrwl · Apr 17, 2023 · 3d85ac0 · 3d85ac0
1 parent e880f11
commit 3d85ac0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/docs/generated/packages/jest/documents/overview.md b/docs/generated/packages/jest/documents/overview.md
@@ -135,7 +135,7 @@ In order to use Jest's global setup/teardown functions that reference nx librari
 Nx provides a helper function that you can import within your setup/teardown file.
 
 ```typescript {% fileName="global-setup.ts" %}
-import { registerTsProject } from '@nrwl/js';
+import { registerTsProject } from '@nrwl/js/src/internal';
 const cleanupRegisteredPaths = registerTsProject('.', 'tsconfig.base.json');
 
 import { yourFancyFunction } from '@some-org/my-util-library';

diff --git a/docs/shared/packages/jest/jest-plugin.md b/docs/shared/packages/jest/jest-plugin.md
@@ -135,7 +135,7 @@ In order to use Jest's global setup/teardown functions that reference nx librari
 Nx provides a helper function that you can import within your setup/teardown file.
 
 ```typescript {% fileName="global-setup.ts" %}
-import { registerTsProject } from '@nrwl/js';
+import { registerTsProject } from '@nrwl/js/src/internal';
 const cleanupRegisteredPaths = registerTsProject('.', 'tsconfig.base.json');
 
 import { yourFancyFunction } from '@some-org/my-util-library';

diff --git a/e2e/jest/src/jest.test.ts b/e2e/jest/src/jest.test.ts
@@ -48,7 +48,7 @@ describe('Jest', () => {
     updateFile(
       `libs/${mylib}/setup.ts`,
       stripIndents`
-      const { registerTsProject } = require('@nrwl/js');
+      const { registerTsProject } = require('nx/src/plugins/js/utils/register');
       const cleanup = registerTsProject('.', 'tsconfig.base.json');
 
       import {setup} from '@global-fun/globals';
@@ -61,7 +61,7 @@ describe('Jest', () => {
     updateFile(
       `libs/${mylib}/teardown.ts`,
       stripIndents`
-      import { registerTsProject } from '@nrwl/js';
+      import { registerTsProject } from 'nx/src/plugins/js/utils/register';
       const cleanup = registerTsProject('.', 'tsconfig.base.json');
 
       import {teardown} from '@global-fun/globals';
@@ -73,19 +73,18 @@ describe('Jest', () => {
     updateFile(
       `libs/${mylib}/jest.config.ts`,
       stripIndents`
-          module.exports = {
-            testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-            transform: {
-              '^.+\\.(ts|js|html)$': 'ts-jest'
-            },
-            resolver: '@nrwl/jest/plugins/resolver',
-            moduleFileExtensions: ['ts', 'js', 'html'],
-            coverageReporters: ['html'],
-            passWithNoTests: true,
-            globals: { testGlobal: ${testGlobal} },
-            globalSetup: '<rootDir>/setup.ts',
-            globalTeardown: '<rootDir>/teardown.ts'
-          };`
+        export default {
+          displayName: "${mylib}",
+          preset: "../../jest.preset.js",
+          transform: {
+            "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+          },
+          moduleFileExtensions: ["ts", "js", "html"],
+          coverageDirectory: "../../coverage/libs/${mylib}",
+          globals: { testGlobal: ${testGlobal} },
+          globalSetup: '<rootDir>/setup.ts',
+          globalTeardown: '<rootDir>/teardown.ts'
+        };`
     );
 
     const appResult = await runCLIAsync(`test ${mylib} --no-watch`);

diff --git a/e2e/node/src/node.test.ts b/e2e/node/src/node.test.ts
@@ -25,7 +25,7 @@ import {
 } from '@nrwl/e2e/utils';
 import { exec, execSync } from 'child_process';
 import * as http from 'http';
-import { getLockFileName } from '@nrwl/js';
+import { getLockFileName } from '@nx/js';
 import { satisfies } from 'semver';
 
 function getData(port, path = '/api'): Promise<any> {