From 0930e54c69d03f5c54323b28e4ac7b39e87a05cd Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Sun, 20 Jul 2025 23:47:23 -0700 Subject: [PATCH 1/5] test: add extra sleep --- src/test/extension.test.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 2104d0b..d5f9f41 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -523,16 +523,10 @@ suite("oil.code", () => { "/002 oil-dir-parent/", ]); - editor.selection = new vscode.Selection( - new vscode.Position(1, 0), - new vscode.Position(1, 0) - ); + editor.selection = new vscode.Selection(1, 0, 1, 0); await vscode.commands.executeCommand("editor.action.deleteLines"); await sleep(100); - editor.selection = new vscode.Selection( - new vscode.Position(1, 0), - new vscode.Position(1, 0) - ); + editor.selection = new vscode.Selection(1, 0, 1, 0); await vscode.commands.executeCommand("oil-code.select"); await sleep(200); @@ -547,6 +541,8 @@ suite("oil.code", () => { await saveFile(); + await sleep(100); + await waitForDocumentText(["/000 ../", "/003 oil-dir-child-renamed/"]); await assertProjectFileStructure([ "oil-dir-parent/", From e4f01cc48269d6942cc63f0f5e0abcf89b7dda0b Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Mon, 21 Jul 2025 00:02:38 -0700 Subject: [PATCH 2/5] test: adjusting more sleeps --- src/test/extension.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index d5f9f41..7ec6472 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -523,10 +523,10 @@ suite("oil.code", () => { "/002 oil-dir-parent/", ]); - editor.selection = new vscode.Selection(1, 0, 1, 0); + editor.selection = new vscode.Selection(1, 5, 1, 5); await vscode.commands.executeCommand("editor.action.deleteLines"); - await sleep(100); - editor.selection = new vscode.Selection(1, 0, 1, 0); + await sleep(200); + editor.selection = new vscode.Selection(1, 5, 1, 5); await vscode.commands.executeCommand("oil-code.select"); await sleep(200); From b774b10e30c8fafeb8ea73ff9e9c7f9c4dfba4de Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Mon, 21 Jul 2025 00:07:01 -0700 Subject: [PATCH 3/5] test: timeouts --- src/commands/select.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/select.ts b/src/commands/select.ts index e7a3c33..25f21f1 100644 --- a/src/commands/select.ts +++ b/src/commands/select.ts @@ -184,7 +184,7 @@ export async function select({ preview(true); } } - }, 100); + }, 50); } else { setTimeout(() => { // When going into a directory, position at first line @@ -194,7 +194,7 @@ export async function select({ if (getPreviewState().previewEnabled) { preview(true); } - }, 100); + }, 50); } // Mark the file as modified if there are pending changes From 3ab30cf35ed699ffcde39acb3c13745842018d9b Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Mon, 21 Jul 2025 00:15:55 -0700 Subject: [PATCH 4/5] test: Add missing sleep --- src/test/extension.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 7ec6472..906b6fa 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -350,6 +350,7 @@ suite("oil.code", () => { await saveFile(); await vscode.commands.executeCommand("oil-code.open"); + await sleep(100); // Move cursor to the file name const position = new vscode.Position(2, 0); From 63ae92ef8260ecbdf2e25dab3d8ff55df9cf55fb Mon Sep 17 00:00:00 2001 From: Corwin Marsh Date: Mon, 21 Jul 2025 00:22:40 -0700 Subject: [PATCH 5/5] test: more activeEditor things --- src/test/extension.test.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 906b6fa..8f2534f 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -419,24 +419,27 @@ suite("oil.code", () => { await saveFile(); await vscode.commands.executeCommand("oil-code.open"); + await sleep(100); + const editor2 = vscode.window.activeTextEditor; + assert.ok(editor2, "No active editor2"); // Move cursor to the file name const position = new vscode.Position(2, 0); - editor.selection = new vscode.Selection(position, position); + editor2.selection = new vscode.Selection(position, position); await vscode.commands.executeCommand("editor.action.deleteLines"); await sleep(100); // Move cursor to the new directory const position3 = new vscode.Position(1, 0); - editor.selection = new vscode.Selection(position3, position3); + editor2.selection = new vscode.Selection(position3, position3); await vscode.commands.executeCommand("oil-code.select"); await sleep(200); - const editor2 = vscode.window.activeTextEditor; - assert.ok(editor2, "No active editor"); - editor2.edit((editBuilder) => { + const editor3 = vscode.window.activeTextEditor; + assert.ok(editor3, "No active editor3"); + editor3.edit((editBuilder) => { editBuilder.insert(new vscode.Position(0, 8), newline); editBuilder.insert(new vscode.Position(1, 0), `/002 oil-file-rename.md`); });