fix(testing): update tests for jest.config.ts changes

update tests broken by renaming jest fils to ts files
nrwl · Apr 21, 2022 · fb40831 · fb40831
1 parent 156505d
commit fb40831
Show file tree

Hide file tree

Showing 42 changed files with 294 additions and 181 deletions.
diff --git a/e2e/angular-core/src/config.test.ts b/e2e/angular-core/src/config.test.ts
@@ -152,7 +152,7 @@ const angularV1Json = (appName: string) => `{
             "builder": "@nrwl/jest:jest",
             "outputs": ["coverage/apps/${appName}"],
             "options": {
-              "jestConfig": "apps/${appName}/jest.config.js",
+              "jestConfig": "apps/${appName}/jest.config.ts",
               "passWithNoTests": true
             }
           }

diff --git a/e2e/jest/src/jest.test.ts b/e2e/jest/src/jest.test.ts
@@ -75,7 +75,7 @@ describe('Jest', () => {
     );
 
     updateFile(
-      `libs/${mylib}/jest.config.js`,
+      `libs/${mylib}/jest.config.ts`,
       stripIndents`
           module.exports = {
             testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

diff --git a/e2e/node/src/node.test.ts b/e2e/node/src/node.test.ts
@@ -356,12 +356,12 @@ describe('nest libraries', function () {
     const nestlib = uniq('nestlib');
     runCLI(`generate @nrwl/nest:lib ${nestlib}`);
 
-    const jestConfigContent = readFile(`libs/${nestlib}/jest.config.js`);
+    const jestConfigContent = readFile(`libs/${nestlib}/jest.config.ts`);
 
     expect(stripIndents`${jestConfigContent}`).toEqual(
       stripIndents`module.exports = {
                 displayName: '${nestlib}',
-                preset: '../../jest.preset.js',
+                preset: '../../jest.preset.ts',
                 globals: {
                   'ts-jest': {
                   tsconfig: '<rootDir>/tsconfig.spec.json',

diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts
@@ -803,7 +803,7 @@ export function expectNoAngularDevkit() {
 
 export function expectNoTsJestInJestConfig(appName: string) {
   const jestConfig = readFile(
-    joinPathFragments('apps', appName, 'jest.config.js')
+    joinPathFragments('apps', appName, 'jest.config.ts')
   );
   expect(jestConfig).not.toContain('ts-jest');
 }

diff --git a/e2e/workspace-core/src/aux-commands.test.ts b/e2e/workspace-core/src/aux-commands.test.ts
@@ -186,7 +186,7 @@ describe('workspace-lint', () => {
     expect(stdout).toContain(
       'The following file(s) do not belong to any projects:'
     );
-    expect(stdout).toContain(`- apps/${appAfter}/jest.config.js`);
+    expect(stdout).toContain(`- apps/${appAfter}/jest.config.ts`);
     expect(stdout).toContain(`- apps/${appAfter}/src/app/app.component.css`);
     expect(stdout).toContain(`- apps/${appAfter}/src/app/app.component.html`);
     expect(stdout).toContain(
@@ -257,12 +257,12 @@ describe('move project', () => {
     expect(moveOutput).toContain(`CREATE ${readmePath}`);
     checkFilesExist(readmePath);
 
-    const jestConfigPath = `${newPath}/jest.config.js`;
+    const jestConfigPath = `${newPath}/jest.config.ts`;
     expect(moveOutput).toContain(`CREATE ${jestConfigPath}`);
     checkFilesExist(jestConfigPath);
     const jestConfig = readFile(jestConfigPath);
     expect(jestConfig).toContain(`displayName: 'shared-${lib1}-data-access'`);
-    expect(jestConfig).toContain(`preset: '../../../../jest.preset.js'`);
+    expect(jestConfig).toContain(`preset: '../../../../jest.preset.ts'`);
     expect(jestConfig).toContain(`'../../../../coverage/${newPath}'`);
 
     const tsConfigPath = `${newPath}/tsconfig.json`;
@@ -395,12 +395,12 @@ describe('move project', () => {
     expect(moveOutput).toContain(`CREATE ${readmePath}`);
     checkFilesExist(readmePath);
 
-    const jestConfigPath = `${newPath}/jest.config.js`;
+    const jestConfigPath = `${newPath}/jest.config.ts`;
     expect(moveOutput).toContain(`CREATE ${jestConfigPath}`);
     checkFilesExist(jestConfigPath);
     const jestConfig = readFile(jestConfigPath);
     expect(jestConfig).toContain(`displayName: 'shared-${lib1}-data-access'`);
-    expect(jestConfig).toContain(`preset: '../../../../jest.preset.js'`);
+    expect(jestConfig).toContain(`preset: '../../../../jest.preset.ts'`);
     expect(jestConfig).toContain(`'../../../../coverage/${newPath}'`);
 
     const tsConfigPath = `${newPath}/tsconfig.json`;
@@ -528,12 +528,12 @@ describe('move project', () => {
     expect(moveOutput).toContain(`CREATE ${readmePath}`);
     checkFilesExist(readmePath);
 
-    const jestConfigPath = `${newPath}/jest.config.js`;
+    const jestConfigPath = `${newPath}/jest.config.ts`;
     expect(moveOutput).toContain(`CREATE ${jestConfigPath}`);
     checkFilesExist(jestConfigPath);
     const jestConfig = readFile(jestConfigPath);
     expect(jestConfig).toContain(`displayName: 'shared-${lib1}-data-access'`);
-    expect(jestConfig).toContain(`preset: '../../../../jest.preset.js'`);
+    expect(jestConfig).toContain(`preset: '../../../../jest.preset.ts'`);
     expect(jestConfig).toContain(`'../../../../coverage/${newPath}'`);
 
     const tsConfigPath = `${newPath}/tsconfig.json`;

diff --git a/e2e/workspace-integrations/src/workspace-aux-commands.test.ts b/e2e/workspace-integrations/src/workspace-aux-commands.test.ts
@@ -445,7 +445,7 @@ describe('Move Angular Project', () => {
     // just check the output
     expect(moveOutput).toContain(`DELETE apps/${app1}`);
     expect(moveOutput).toContain(`CREATE apps/${newPath}/.browserslistrc`);
-    expect(moveOutput).toContain(`CREATE apps/${newPath}/jest.config.js`);
+    expect(moveOutput).toContain(`CREATE apps/${newPath}/jest.config.ts`);
     expect(moveOutput).toContain(`CREATE apps/${newPath}/tsconfig.app.json`);
     expect(moveOutput).toContain(`CREATE apps/${newPath}/tsconfig.json`);
     expect(moveOutput).toContain(`CREATE apps/${newPath}/tsconfig.spec.json`);

diff --git a/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -112,7 +112,7 @@ Object {
     "test": Object {
       "builder": "@nrwl/jest:jest",
       "options": Object {
-        "jestConfig": "apps/my-dir/my-app/jest.config.js",
+        "jestConfig": "apps/my-dir/my-app/jest.config.ts",
         "passWithNoTests": true,
       },
       "outputs": Array [
@@ -281,7 +281,7 @@ Object {
     "test": Object {
       "builder": "@nrwl/jest:jest",
       "options": Object {
-        "jestConfig": "apps/my-app/jest.config.js",
+        "jestConfig": "apps/my-app/jest.config.ts",
         "passWithNoTests": true,
       },
       "outputs": Array [

diff --git a/packages/angular/src/generators/application/application.spec.ts b/packages/angular/src/generators/application/application.spec.ts
@@ -70,7 +70,7 @@ describe('app', () => {
     it('should generate files', async () => {
       await generateApp(appTree);
 
-      expect(appTree.exists(`apps/my-app/jest.config.js`)).toBeTruthy();
+      expect(appTree.exists(`apps/my-app/jest.config.ts`)).toBeTruthy();
       expect(appTree.exists('apps/my-app/src/main.ts')).toBeTruthy();
       expect(appTree.exists('apps/my-app/src/app/app.module.ts')).toBeTruthy();
       expect(
@@ -113,13 +113,13 @@ describe('app', () => {
     it('should setup jest with serializers', async () => {
       await generateApp(appTree);
 
-      expect(appTree.read('apps/my-app/jest.config.js', 'utf-8')).toContain(
+      expect(appTree.read('apps/my-app/jest.config.ts', 'utf-8')).toContain(
         `'jest-preset-angular/build/serializers/no-ng-attributes'`
       );
-      expect(appTree.read('apps/my-app/jest.config.js', 'utf-8')).toContain(
+      expect(appTree.read('apps/my-app/jest.config.ts', 'utf-8')).toContain(
         `'jest-preset-angular/build/serializers/ng-snapshot'`
       );
-      expect(appTree.read('apps/my-app/jest.config.js', 'utf-8')).toContain(
+      expect(appTree.read('apps/my-app/jest.config.ts', 'utf-8')).toContain(
         `'jest-preset-angular/build/serializers/html-comment'`
       );
     });
@@ -249,7 +249,7 @@ describe('app', () => {
 
       // Make sure these exist
       [
-        `apps/my-dir/my-app/jest.config.js`,
+        `apps/my-dir/my-app/jest.config.ts`,
         'apps/my-dir/my-app/src/main.ts',
         'apps/my-dir/my-app/src/app/app.module.ts',
         'apps/my-dir/my-app/src/app/app.component.ts',
@@ -332,7 +332,7 @@ describe('app', () => {
 
       // Make sure these exist
       [
-        'my-dir/my-app/jest.config.js',
+        'my-dir/my-app/jest.config.ts',
         'my-dir/my-app/src/main.ts',
         'my-dir/my-app/src/app/app.module.ts',
         'my-dir/my-app/src/app/app.component.ts',
@@ -631,10 +631,10 @@ describe('app', () => {
 
   describe('--unit-test-runner', () => {
     describe('default (jest)', () => {
-      it('should generate jest.config.js with serializers', async () => {
+      it('should generate jest.config.ts with serializers', async () => {
         await generateApp(appTree);
 
-        const jestConfig = appTree.read('apps/my-app/jest.config.js', 'utf-8');
+        const jestConfig = appTree.read('apps/my-app/jest.config.ts', 'utf-8');
 
         expect(jestConfig).toContain(
           `'jest-preset-angular/build/serializers/no-ng-attributes'`
@@ -678,7 +678,7 @@ describe('app', () => {
         expect(appTree.exists('apps/my-app/src/test-setup.ts')).toBeFalsy();
         expect(appTree.exists('apps/my-app/src/test.ts')).toBeFalsy();
         expect(appTree.exists('apps/my-app/tsconfig.spec.json')).toBeFalsy();
-        expect(appTree.exists('apps/my-app/jest.config.js')).toBeFalsy();
+        expect(appTree.exists('apps/my-app/jest.config.ts')).toBeFalsy();
         expect(appTree.exists('apps/my-app/karma.config.js')).toBeFalsy();
         expect(
           appTree.exists('apps/my-app/src/app/app.component.spec.ts')

diff --git a/packages/angular/src/generators/init/init.spec.ts b/packages/angular/src/generators/init/init.spec.ts
@@ -140,7 +140,7 @@ describe('init', () => {
           skipFormat: false,
         });
 
-        const hasJestConfigFile = host.exists('jest.config.js');
+        const hasJestConfigFile = host.exists('jest.config.ts');
 
         // ASSERT
         expect(hasJestConfigFile).toBeTruthy();

diff --git a/packages/angular/src/generators/library/library.spec.ts b/packages/angular/src/generators/library/library.spec.ts
@@ -429,7 +429,7 @@ describe('lib', () => {
       await runLibraryGeneratorWithOpts({ name: 'my-lib2' });
 
       // ASSERT
-      expect(tree.exists(`libs/my-lib/jest.config.js`)).toBeTruthy();
+      expect(tree.exists(`libs/my-lib/jest.config.ts`)).toBeTruthy();
       expect(tree.exists('libs/my-lib/src/index.ts')).toBeTruthy();
       expect(tree.exists('libs/my-lib/src/lib/my-lib.module.ts')).toBeTruthy();
 
@@ -444,7 +444,7 @@ describe('lib', () => {
         tree.exists('libs/my-lib/src/lib/my-lib.service.spec.ts')
       ).toBeFalsy();
 
-      expect(tree.exists(`libs/my-lib2/jest.config.js`)).toBeTruthy();
+      expect(tree.exists(`libs/my-lib2/jest.config.ts`)).toBeTruthy();
       expect(tree.exists('libs/my-lib2/src/index.ts')).toBeTruthy();
       expect(
         tree.exists('libs/my-lib2/src/lib/my-lib2.module.ts')
@@ -544,7 +544,7 @@ describe('lib', () => {
       });
 
       // ASSERT
-      expect(tree.exists(`libs/my-dir/my-lib/jest.config.js`)).toBeTruthy();
+      expect(tree.exists(`libs/my-dir/my-lib/jest.config.ts`)).toBeTruthy();
       expect(tree.exists('libs/my-dir/my-lib/src/index.ts')).toBeTruthy();
       expect(
         tree.exists('libs/my-dir/my-lib/src/lib/my-dir-my-lib.module.ts')
@@ -563,7 +563,7 @@ describe('lib', () => {
         tree.exists('libs/my-dir/my-lib/src/lib/my-lib.service.spec.ts')
       ).toBeFalsy();
 
-      expect(tree.exists(`libs/my-dir/my-lib2/jest.config.js`)).toBeTruthy();
+      expect(tree.exists(`libs/my-dir/my-lib2/jest.config.ts`)).toBeTruthy();
       expect(tree.exists('libs/my-dir/my-lib2/src/index.ts')).toBeTruthy();
       expect(
         tree.exists('libs/my-dir/my-lib2/src/lib/my-lib2.module.ts')
@@ -740,7 +740,7 @@ describe('lib', () => {
       // Make sure these exist
       [
         'my-dir/my-lib/.browserslistrc',
-        'my-dir/my-lib/jest.config.js',
+        'my-dir/my-lib/jest.config.ts',
         'my-dir/my-lib/ng-package.json',
         'my-dir/my-lib/project.json',
         'my-dir/my-lib/tsconfig.lib.prod.json',
@@ -1192,7 +1192,7 @@ describe('lib', () => {
       expect(tree.exists('libs/my-lib/src/test.ts')).toBeFalsy();
       expect(tree.exists('libs/my-lib/src/test.ts')).toBeFalsy();
       expect(tree.exists('libs/my-lib/tsconfig.spec.json')).toBeFalsy();
-      expect(tree.exists('libs/my-lib/jest.config.js')).toBeFalsy();
+      expect(tree.exists('libs/my-lib/jest.config.ts')).toBeFalsy();
       expect(tree.exists('libs/my-lib/karma.conf.js')).toBeFalsy();
       expect(workspaceJson.projects['my-lib'].architect.test).toBeUndefined();
     });

diff --git a/...src/generators/storybook-configuration/__snapshots__/storybook-configuration.spec.ts.snap b/...src/generators/storybook-configuration/__snapshots__/storybook-configuration.spec.ts.snap
@@ -54,13 +54,13 @@ Array [
   "apps/one/two/test-ui-lib-e2e/src/support/commands.ts",
   "apps/one/two/test-ui-lib-e2e/src/support/index.ts",
   "apps/one/two/test-ui-lib-e2e/tsconfig.json",
-  "jest.config.js",
-  "jest.preset.js",
+  "jest.config.ts",
+  "jest.preset.ts",
   "libs/test-ui-lib/.eslintrc.json",
   "libs/test-ui-lib/.storybook/main.js",
   "libs/test-ui-lib/.storybook/preview.js",
   "libs/test-ui-lib/.storybook/tsconfig.json",
-  "libs/test-ui-lib/jest.config.js",
+  "libs/test-ui-lib/jest.config.ts",
   "libs/test-ui-lib/README.md",
   "libs/test-ui-lib/src/index.ts",
   "libs/test-ui-lib/src/lib/barrel/barrel-button/barrel-button.component.css",
@@ -159,13 +159,13 @@ Array [
   "apps/test-ui-lib-e2e/src/support/commands.ts",
   "apps/test-ui-lib-e2e/src/support/index.ts",
   "apps/test-ui-lib-e2e/tsconfig.json",
-  "jest.config.js",
-  "jest.preset.js",
+  "jest.config.ts",
+  "jest.preset.ts",
   "libs/test-ui-lib/.eslintrc.json",
   "libs/test-ui-lib/.storybook/main.js",
   "libs/test-ui-lib/.storybook/preview.js",
   "libs/test-ui-lib/.storybook/tsconfig.json",
-  "libs/test-ui-lib/jest.config.js",
+  "libs/test-ui-lib/jest.config.ts",
   "libs/test-ui-lib/README.md",
   "libs/test-ui-lib/src/index.ts",
   "libs/test-ui-lib/src/lib/barrel/barrel-button/barrel-button.component.css",

diff --git a/packages/express/src/generators/application/application.spec.ts b/packages/express/src/generators/application/application.spec.ts
@@ -90,6 +90,7 @@ Object {
     ],
   },
   "exclude": Array [
+    "jest.config.ts",
     "**/*.spec.ts",
     "**/*.test.ts",
   ],
@@ -124,6 +125,7 @@ Object {
       );
       expect(tsConfigApp.include).toEqual(['**/*.ts', '**/*.js']);
       expect(tsConfigApp.exclude).toEqual([
+        'jest.config.ts',
         '**/*.spec.ts',
         '**/*.test.ts',
         '**/*.spec.js',