Adjust all tests

storybookjs · Dec 22, 2023 · 146cd79 · 146cd79
1 parent 1654326
commit 146cd79
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 62 deletions.
diff --git a/code/frameworks/nextjs/template/cli/ts-3-8/Header.tsx b/code/frameworks/nextjs/template/cli/ts-3-8/Header.tsx
@@ -9,9 +9,9 @@ type User = {
 
 interface HeaderProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => (

diff --git a/code/frameworks/nextjs/template/cli/ts-4-9/Header.tsx b/code/frameworks/nextjs/template/cli/ts-4-9/Header.tsx
@@ -9,9 +9,9 @@ type User = {
 
 interface HeaderProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => (

diff --git a/code/lib/cli/src/generators/configure.test.ts b/code/lib/cli/src/generators/configure.test.ts
@@ -128,7 +128,6 @@ describe('configurePreview', () => {
       "/** @type { import('@storybook/react').Preview } */
       const preview = {
         parameters: {
-          actions: { argTypesRegex: '^on[A-Z].*' },
           controls: {
             matchers: {
               color: /(background|color)$/i,

diff --git a/code/lib/instrumenter/src/instrumenter.test.ts b/code/lib/instrumenter/src/instrumenter.test.ts
@@ -1,7 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import { addons, mockChannel } from '@storybook/preview-api';
 import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest';
-import { logger } from '@storybook/client-logger';
 import {
   FORCE_REMOUNT,
   SET_CURRENT_STORY,
@@ -418,23 +417,23 @@ describe('Instrumenter', () => {
     );
   });
 
-  it('catches thrown errors and throws an ignoredException instead', () => {
+  it('rethrows errors', () => {
     const { fn } = instrument({
       fn: () => {
         throw new Error('Boom!');
       },
     });
-    expect(fn).toThrow('ignoredException');
+    expect(fn).toThrow('Boom!');
   });
 
-  it('catches nested exceptions and throws an ignoredException instead', () => {
+  it('catches nested exceptions and rethrows', () => {
     const { fn1, fn2 } = instrument({
       fn1: (_: any) => {},
       fn2: () => {
         throw new Error('Boom!');
       },
     });
-    expect(() => fn1(fn2())).toThrow('ignoredException');
+    expect(() => fn1(fn2())).toThrow('Boom!');
   });
 
   it('bubbles child exceptions up to parent (in callback)', () => {
@@ -448,15 +447,19 @@ describe('Instrumenter', () => {
     vi.spyOn(instrumented, 'fn1');
 
     const { fn1, fn2 } = instrumented;
-    expect(() =>
+    let error;
+    try {
       fn1(() => {
         fn2();
-      })
-    ).toThrow('ignoredException');
+      });
+    } catch (e) {
+      error = e;
+    }
 
     expect(fn1).toHaveBeenCalled();
-    expect(logger.warn).toHaveBeenCalledWith(new Error('Boom!'));
-    expect((logger.warn as any).mock.calls[0][0].callId).toBe('kind--story [0] fn1 [0] fn2');
+    expect(error).toEqual(new Error('Boom!'));
+    // @ts-expect-error callId is what is tested
+    expect(error.callId).toBe('kind--story [0] fn1 [0] fn2');
   });
 
   it("re-throws anything that isn't an error", () => {

diff --git a/code/lib/preview-api/src/modules/preview-web/PreviewWeb.test.ts b/code/lib/preview-api/src/modules/preview-web/PreviewWeb.test.ts
@@ -12,7 +12,6 @@ import {
   FORCE_REMOUNT,
   FORCE_RE_RENDER,
   GLOBALS_UPDATED,
-  IGNORED_EXCEPTION,
   PREVIEW_KEYDOWN,
   RESET_STORY_ARGS,
   SET_CURRENT_STORY,
@@ -130,6 +129,9 @@ beforeEach(() => {
   projectAnnotations.decorators[0].mockClear();
   docsRenderer.render.mockClear();
   vi.mocked(logger.warn).mockClear();
+  // eslint-disable-next-line no-console
+  vi.mocked(console.error).mockReset();
+
   mockStoryIndex.mockReset().mockReturnValue(storyIndex);
 
   addons.setChannel(mockChannel as any);
@@ -629,24 +631,6 @@ describe('PreviewWeb', () => {
 
         expect(mockChannel.emit).toHaveBeenCalledWith(STORY_RENDERED, 'component-one--a');
       });
-
-      it('does not show error display if the render function throws IGNORED_EXCEPTION', async () => {
-        document.location.search = '?id=component-one--a';
-        projectAnnotations.renderToCanvas.mockImplementation(() => {
-          throw IGNORED_EXCEPTION;
-        });
-
-        const preview = new PreviewWeb();
-        await preview.initialize({ importFn, getProjectAnnotations });
-
-        await waitForRender();
-
-        expect(mockChannel.emit).toHaveBeenCalledWith(
-          STORY_THREW_EXCEPTION,
-          serializeError(IGNORED_EXCEPTION)
-        );
-        expect(preview.view.showErrorDisplay).not.toHaveBeenCalled();
-      });
     });
 
     describe('CSF docs entries', () => {

diff --git a/code/lib/preview-api/vitest.config.ts b/code/lib/preview-api/vitest.config.ts
@@ -6,7 +6,7 @@ export default mergeConfig(
   vitestCommonConfig,
   defineConfig({
     test: {
-      environment: 'node',
+      environment: 'jsdom',
       name: __dirname.split(sep).slice(-2).join(posix.sep),
     },
   })

diff --git a/code/renderers/html/template/cli/ts-3-8/Header.ts b/code/renderers/html/template/cli/ts-3-8/Header.ts
@@ -3,9 +3,9 @@ import { createButton } from './Button';
 
 export interface HeaderProps {
   user?: { name: string };
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const createHeader = ({ user, onLogout, onLogin, onCreateAccount }: HeaderProps) => {

diff --git a/code/renderers/html/template/cli/ts-4-9/Header.ts b/code/renderers/html/template/cli/ts-4-9/Header.ts
@@ -3,9 +3,9 @@ import { createButton } from './Button';
 
 export interface HeaderProps {
   user?: { name: string };
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const createHeader = ({ user, onLogout, onLogin, onCreateAccount }: HeaderProps) => {

diff --git a/code/renderers/react/template/cli/ts-3-8/Header.tsx b/code/renderers/react/template/cli/ts-3-8/Header.tsx
@@ -9,9 +9,9 @@ type User = {
 
 interface HeaderProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => (

diff --git a/code/renderers/react/template/cli/ts-4-9/Header.tsx b/code/renderers/react/template/cli/ts-4-9/Header.tsx
@@ -9,9 +9,9 @@ type User = {
 
 interface HeaderProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => (

diff --git a/code/renderers/svelte/src/render.ts b/code/renderers/svelte/src/render.ts
@@ -36,7 +36,7 @@ function teardown(canvasElement: SvelteRenderer['canvasElement']) {
 function createRoot(target: HTMLElement, props: any) {
   if ((svelte as any).createRoot) {
     // Svelte v5
-    return svelte.createRoot(PreviewRender, {
+    return (svelte as any).createRoot(PreviewRender, {
       target,
       props,
     });

diff --git a/code/renderers/web-components/template/cli/ts-3-8/Header.ts b/code/renderers/web-components/template/cli/ts-3-8/Header.ts
@@ -9,9 +9,9 @@ type User = {
 
 export interface HeaderProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => html`

diff --git a/code/renderers/web-components/template/cli/ts-3-8/Page.ts b/code/renderers/web-components/template/cli/ts-3-8/Page.ts
@@ -8,9 +8,9 @@ type User = {
 
 export interface PageProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Page = ({ user, onLogin, onLogout, onCreateAccount }: PageProps) => html`

diff --git a/code/renderers/web-components/template/cli/ts-4-9/Header.ts b/code/renderers/web-components/template/cli/ts-4-9/Header.ts
@@ -9,9 +9,9 @@ type User = {
 
 export interface HeaderProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => html`

diff --git a/code/renderers/web-components/template/cli/ts-4-9/Page.ts b/code/renderers/web-components/template/cli/ts-4-9/Page.ts
@@ -8,9 +8,9 @@ type User = {
 
 export interface PageProps {
   user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
 }
 
 export const Page = ({ user, onLogin, onLogout, onCreateAccount }: PageProps) => html`

diff --git a/code/ui/manager/src/components/layout/Layout.stories.tsx b/code/ui/manager/src/components/layout/Layout.stories.tsx
@@ -4,6 +4,7 @@ import React, { useState } from 'react';
 
 import { styled } from '@storybook/theming';
 import type { Meta, StoryObj } from '@storybook/react';
+import { fn } from '@storybook/test';
 import { Layout } from './Layout';
 import { LayoutProvider } from './LayoutProvider';
 import MobileNavigationStoriesMeta from '../mobile/navigation/MobileNavigation.stories';
@@ -58,6 +59,7 @@ const meta = {
     slotSidebar: <MockSidebar />,
     slotPanel: <MockPanel />,
     slotPages: <MockPage />,
+    setManagerLayoutState: fn(),
   },
   parameters: {
     theme: 'light',