Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Wait for the rename to settle in the show-ok-folders Delete test (#5052)

Nick Gomeze576f8357dab
diff --git a/packages/app/src/components/FileTree.duplicate.dom.test.tsx b/packages/app/src/components/FileTree.duplicate.dom.test.tsx
index 642b0ac40..839fcb2f4 100644
--- a/packages/app/src/components/FileTree.duplicate.dom.test.tsx
+++ b/packages/app/src/components/FileTree.duplicate.dom.test.tsx
@@ -418,6 +418,7 @@ vi.doMock('@pierre/trees/react', () => ({
onClickCapture,
onMouseMove,
onMouseLeave,
+ 'data-state': dataState,
}: {
renderContextMenu?: (
item: typeof menuItem,
@@ -426,9 +427,11 @@ vi.doMock('@pierre/trees/react', () => ({
onClickCapture?: MouseEventHandler<HTMLDivElement>;
onMouseMove?: MouseEventHandler<HTMLDivElement>;
onMouseLeave?: MouseEventHandler<HTMLDivElement>;
+ 'data-state'?: string;
}) => (
<div
data-testid="fake-pierre-tree"
+ data-state={dataState}
role="tree"
onClickCapture={onClickCapture}
onMouseMove={onMouseMove}
@@ -1030,6 +1033,27 @@ describe('FileTree duplicate action runtime behavior', () => {
);
});
+ test('the tree reports busy while a file-tree action is in flight and idle once it settles', async () => {
+ let releaseDuplicate: () => void = () => {};
+ duplicateGate = new Promise<void>((resolve) => {
+ releaseDuplicate = resolve;
+ });
+ const user = userEvent.setup();
+ renderFileTree();
+
+ const duplicate = await screen.findByRole('menuitem', { name: /duplicate/i });
+ fetchCalls = [];
+ await user.click(duplicate);
+ await waitFor(() => expect(duplicateCalls()).toHaveLength(1));
+
+ expect(screen.getByTestId('fake-pierre-tree').getAttribute('data-state')).toBe('busy');
+
+ releaseDuplicate();
+ await waitFor(() =>
+ expect(screen.getByTestId('fake-pierre-tree').getAttribute('data-state')).toBe('idle'),
+ );
+ });
+
test('Delete on a revealed .ok row opens no delete confirmation', async () => {
renderFileTree();
await screen.findByRole('menuitem', { name: /duplicate/i });
diff --git a/packages/app/src/components/FileTree.tsx b/packages/app/src/components/FileTree.tsx
index 99a6e7368..69b544117 100644
--- a/packages/app/src/components/FileTree.tsx
+++ b/packages/app/src/components/FileTree.tsx
@@ -3145,6 +3145,7 @@ export function FileTree({ ref }: { ref?: Ref<FileTreeHandle | null> }) {
model={model}
style={createFileTreeStyle(resolvedTheme)}
{...{ [FILE_TREE_CREATION_CLEARED_ATTR]: creationDirCleared ? '' : undefined }}
+ data-state={anyActionBusy ? 'busy' : 'idle'}
onClickCapture={handleTreeClickCapture}
onDoubleClickCapture={handleTreeDoubleClickCapture}
onMouseMove={handleTreeMouseMove}
diff --git a/packages/app/tests/stress/show-ok-folders.e2e.ts b/packages/app/tests/stress/show-ok-folders.e2e.ts
index 2d9a425b9..dbbce396b 100644
--- a/packages/app/tests/stress/show-ok-folders.e2e.ts
+++ b/packages/app/tests/stress/show-ok-folders.e2e.ts
@@ -169,6 +169,10 @@ test('an activated .ok folder row never becomes a mutation target — create fal
const renameInput = page.getByRole('textbox', { name: /rename Untitled/i });
await expect(renameInput).toBeVisible({ timeout: 10_000 });
await renameInput.fill(createdDoc);
+ const renameResponse = page.waitForResponse(
+ (response) =>
+ response.url().endsWith('/api/rename-path') && response.request().method() === 'POST',
+ );
await renameInput.press('Enter');
await fileRow(page, `${createdDoc}.md`).waitFor({ state: 'visible', timeout: 15_000 });
@@ -178,6 +182,8 @@ test('an activated .ok folder row never becomes a mutation target — create fal
})
.toBe(true);
expect(existsSync(join(okDir, `${createdDoc}.md`))).toBe(false);
+ await renameResponse;
+ await expect(sidebar(page).locator('file-tree-container')).toHaveAttribute('data-state', 'idle');
await treeScroller(page).evaluate((el) => {
el.scrollTop = 0;
@@ -189,6 +195,7 @@ test('an activated .ok folder row never becomes a mutation target — create fal
await expect(controlRow).toBeFocused();
await page.keyboard.press('Delete');
await expect(page.getByRole('alertdialog')).toBeVisible({ timeout: 10_000 });
+ await expect(page.getByRole('alertdialog')).toHaveAccessibleName(`Delete ${controlFolder}/`);
await page.keyboard.press('Escape');
await expect(page.getByRole('alertdialog')).toHaveCount(0);