Merge pull request #18196 from storybookjs/chore/fix-angular-test-pre…

…sets Cleanup noise from unit tests
storybookjs · May 16, 2022 · 3e2b7f1 · 3e2b7f1
2 parents fb4f6dc + 7198662
commit 3e2b7f1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/app/angular/setup-jest.ts b/app/angular/setup-jest.ts
@@ -1,4 +1,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 
 global.EventSource = class {} as any;
diff --git a/app/angular/src/builders/build-storybook/index.spec.ts b/app/angular/src/builders/build-storybook/index.spec.ts
@@ -142,7 +142,7 @@ describe('Build Storybook Builder', () => {
   });
 
   it('should throw error', async () => {
-    buildStandaloneMock.mockRejectedValue(new Error());
+    buildStandaloneMock.mockRejectedValue(true);
 
     const run = await architect.scheduleBuilder('@storybook/angular:start-storybook', {
       browserTarget: 'angular-cli:build-2',

diff --git a/app/angular/src/builders/start-storybook/index.spec.ts b/app/angular/src/builders/start-storybook/index.spec.ts
@@ -124,7 +124,7 @@ describe('Start Storybook Builder', () => {
   });
 
   it('should throw error', async () => {
-    buildStandaloneMock.mockRejectedValue(new Error());
+    buildStandaloneMock.mockRejectedValue(true);
 
     const run = await architect.scheduleBuilder('@storybook/angular:start-storybook', {
       browserTarget: 'angular-cli:build-2',

diff --git a/app/angular/src/client/preview/angular-beta/RendererFactory.test.ts b/app/angular/src/client/preview/angular-beta/RendererFactory.test.ts
@@ -22,6 +22,7 @@ describe('RendererFactory', () => {
     rootTargetDOMNode = global.document.getElementById('root');
     rootDocstargetDOMNode = global.document.getElementById('root-docs');
     (platformBrowserDynamic as any).mockImplementation(platformBrowserDynamicTesting);
+    jest.spyOn(console, 'log').mockImplementation(() => {});
   });
 
   afterEach(() => {

diff --git a/...angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json b/...angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json
@@ -2,6 +2,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "baseUrl": ".",
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,

diff --git a/...rver/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/tsconfig.lib.json b/...rver/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/tsconfig.lib.json
@@ -2,6 +2,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "baseUrl": ".",
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "declaration": true,

diff --git a/examples/angular-cli/jest-config/setup.ts b/examples/angular-cli/jest-config/setup.ts
@@ -1,4 +1,4 @@
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 import './globalMocks';
 
 require('@storybook/babel-plugin-require-context-hook/register')();
diff --git a/examples/angular-cli/jest.config.js b/examples/angular-cli/jest.config.js
@@ -7,7 +7,7 @@ module.exports = {
   preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
-      tsConfig: path.join(__dirname, 'src/tsconfig.spec.json'),
+      tsconfig: path.join(__dirname, 'src/tsconfig.spec.json'),
       stringifyContentPathRegex: '\\.html$',
       astTransformers: {
         before: [
@@ -26,9 +26,9 @@ module.exports = {
   },
   moduleFileExtensions: [...config.moduleFileExtensions, 'html'],
   snapshotSerializers: [
-    'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
-    'jest-preset-angular/build/AngularSnapshotSerializer.js',
-    'jest-preset-angular/build/HTMLCommentSerializer.js',
+    'jest-preset-angular/build/serializers/html-comment',
+    'jest-preset-angular/build/serializers/ng-snapshot',
+    'jest-preset-angular/build/serializers/no-ng-attributes',
   ],
   setupFilesAfterEnv: ['./jest-config/setup.ts'],
   testPathIgnorePatterns: ['app.component.spec.ts'],