Fix tests

storybookjs · Jul 4, 2022 · c36d10c · c36d10c
1 parent 96fb6c2
commit c36d10c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/preview-web/src/PreviewWeb.test.ts b/lib/preview-web/src/PreviewWeb.test.ts
@@ -85,7 +85,7 @@ jest.mock('react-dom');
 jest.mock('./WebView');
 
 const serializeError = (error: Error) => {
-  const { name, message, stack } = error;
+  const { name = 'Error', message = String(error), stack } = error;
   return { name, message, stack };
 };
 

diff --git a/lib/preview-web/src/StoryRender.ts b/lib/preview-web/src/StoryRender.ts
@@ -236,9 +236,10 @@ export class StoryRender<TFramework extends AnyFramework> implements Render<TFra
         this.teardownRender = teardown || (() => {});
       });
       this.notYetRendered = false;
-      if (abortSignal.aborted || this.phase !== 'rendering') return;
+      if (abortSignal.aborted) return;
 
-      if (forceRemount && playFunction) {
+      // The phase should be 'rendering' but it might be set to 'aborted' by another render cycle
+      if (forceRemount && playFunction && this.phase !== 'errored') {
         this.disableKeyListeners = true;
         try {
           await this.runPhase(abortSignal, 'playing', async () => {