fix(RemoveFileCommand): ensure only delete file tab was closed

sleistner · Aug 26, 2019 · 557e794 · 557e794
1 parent 881983b
commit 557e794
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/src/command/RemoveFileCommand.ts b/src/command/RemoveFileCommand.ts
@@ -6,8 +6,7 @@ export class RemoveFileCommand extends BaseCommand {
     public async execute(uri?: Uri) {
         const fileItem = await this.controller.showDialog();
         if (fileItem) {
-            await this.controller.execute({ fileItem });
-            return this.controller.closeCurrentFileEditor();
+            return this.controller.execute({ fileItem });
         }
     }
 

diff --git a/src/controller/RemoveFileController.ts b/src/controller/RemoveFileController.ts
@@ -14,7 +14,7 @@ export class RemoveFileController extends BaseFileController {
             throw new Error();
         }
 
-        if (!this.confirmDelete) {
+        if (this.confirmDelete === false) {
             return new FileItem(sourcePath);
         }
 

diff --git a/test/command/RemoveFileCommand.test.ts b/test/command/RemoveFileCommand.test.ts
@@ -19,16 +19,16 @@ describe('RemoveFileCommand', () => {
             beforeEach(async () => {
                 await helper.openDocument(helper.editorFile1);
                 helper.createShowInformationMessageStub().resolves(helper.targetFile.path);
+                helper.createGetConfigurationStub({});
             });
 
             afterEach(async () => {
                 await helper.closeAllEditors();
                 helper.restoreShowInformationMessage();
+                helper.restoreGetConfiguration();
             });
 
             describe('configuration', () => {
-                afterEach(async () => helper.restoreGetConfiguration());
-
                 describe('delete.useTrash set to false', () => {
                     beforeEach(async () => {
                         helper.createGetConfigurationStub({ 'delete.useTrash': false, 'delete.confirm': true });
@@ -67,7 +67,9 @@ describe('RemoveFileCommand', () => {
             });
 
             describe('responding with no', () => {
-                beforeEach(async () => helper.createShowInformationMessageStub().resolves(false));
+                beforeEach(async () => {
+                    helper.createShowInformationMessageStub().resolves(false);
+                });
 
                 it('leaves the file untouched', async () => {
                     try {
@@ -85,31 +87,13 @@ describe('RemoveFileCommand', () => {
                     helper.createGetConfigurationStub({ 'delete.useTrash': false, 'delete.confirm': false });
                 });
 
-                afterEach(async () => helper.restoreGetConfiguration());
-
                 it('deletes the file without confirmation', async () => {
                     await subject.execute();
                     const message = `${helper.editorFile1.path} does not exist`;
                     expect(window.showInformationMessage).to.have.not.been.called;
                     expect(fs.existsSync(helper.editorFile1.fsPath), message).to.be.false;
                 });
             });
-
-            it('closes file editor', async () => {
-                let activeEditor;
-
-                const retryable = async () => {
-                    await subject.execute();
-                    activeEditor = window.activeTextEditor;
-
-                    if (activeEditor) {
-                        throw new Error();
-                    }
-                };
-
-                await retry(retryable, { max_tries: 4, interval: 500 });
-                expect(activeEditor).to.not.exist;
-            });
         });
 
         describe('with no open text document', () => {