diff --git a/packages/client/ui-sidebar-documentpreview/tests/renderer-loading.client.spec.tsx b/packages/client/ui-sidebar-documentpreview/tests/renderer-loading.client.spec.tsx index 8566142c5c..84fdab2c51 100644 --- a/packages/client/ui-sidebar-documentpreview/tests/renderer-loading.client.spec.tsx +++ b/packages/client/ui-sidebar-documentpreview/tests/renderer-loading.client.spec.tsx @@ -27,9 +27,11 @@ it('lets a non-Office renderer load content, report its version, and reload thro const custom: DocumentPreviewDefinition = { id: 'custom-viewer', extensions: ['md'], binaryExtensions: ['md'], title: () => 'Custom', loading: 'renderer', } + const initialRead = Promise.withResolvers<{ text: string; version: string }>() + const reloadedRead = Promise.withResolvers<{ text: string; version: string }>() const read = vi.fn<(signal: AbortSignal) => Promise<{ text: string; version: string }>>() - .mockResolvedValueOnce({ text: 'Custom content v1', version: 'v1' }) - .mockResolvedValueOnce({ text: 'Custom content v2', version: 'v2' }) + .mockReturnValueOnce(initialRead.promise) + .mockReturnValueOnce(reloadedRead.promise) function CustomBody({ content }: { content: DocumentContent }) { const [file, setFile] = useState<{ text: string; version: string; revision: number }>() const request = content.kind === 'renderer' ? content : undefined @@ -55,7 +57,11 @@ it('lets a non-Office renderer load content, report its version, and reload thro const useDocumentPreviews: TextPreviewProps['useDocumentPreviews'] = selector => selector([custom]) const view = render() expect(read).toHaveBeenCalledTimes(1) - expect(await screen.findByText('Custom content v1')).toBeTruthy() + expect(screen.getByText('Loading custom content')).toBeTruthy() + expect(h.instance.getSnapshot().byTab[TAB_ID]?.version).toBeUndefined() + // Resolving inside act waits for the DOM commit and the version-reporting effect. + await act(async () => { initialRead.resolve({ text: 'Custom content v1', version: 'v1' }) }) + expect(screen.getByText('Custom content v1')).toBeTruthy() expect(h.instance.getSnapshot().byTab[TAB_ID]?.version).toBe('v1') act(() => { h.instance.actions.toggledAutoRefresh(TAB_ID) }) h.setVersion('v2') @@ -63,7 +69,9 @@ it('lets a non-Office renderer load content, report its version, and reload thro expect(screen.getByText('changed')).toBeTruthy() expect(read).toHaveBeenCalledTimes(1) fireEvent.click(screen.getByRole('button', { name: 'reloadNow' })) - expect(await screen.findByText('Custom content v2')).toBeTruthy() + expect(screen.getByText('Loading custom content')).toBeTruthy() + await act(async () => { reloadedRead.resolve({ text: 'Custom content v2', version: 'v2' }) }) + expect(screen.getByText('Custom content v2')).toBeTruthy() expect(read).toHaveBeenCalledTimes(2) expect(h.instance.getSnapshot().byTab[TAB_ID]?.version).toBe('v2') expect(screen.queryByText('changed')).toBeNull()