From d013da485dce66f45befcebdc07a36ed1cddb09d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 5 Mar 2018 14:44:51 +0100 Subject: [PATCH] fix tests --- .../_vscode/{keepfolder.txt => settings.json} | 0 .../_vscode/{keepfolder.txt => settings.json} | 0 src/vs/code/test/node/windowsFinder.test.ts | 12 ------------ 3 files changed, 12 deletions(-) rename src/vs/code/test/node/fixtures/vscode_folder/_vscode/{keepfolder.txt => settings.json} (100%) rename src/vs/code/test/node/fixtures/vscode_folder/nested_vscode_folder/_vscode/{keepfolder.txt => settings.json} (100%) diff --git a/src/vs/code/test/node/fixtures/vscode_folder/_vscode/keepfolder.txt b/src/vs/code/test/node/fixtures/vscode_folder/_vscode/settings.json similarity index 100% rename from src/vs/code/test/node/fixtures/vscode_folder/_vscode/keepfolder.txt rename to src/vs/code/test/node/fixtures/vscode_folder/_vscode/settings.json diff --git a/src/vs/code/test/node/fixtures/vscode_folder/nested_vscode_folder/_vscode/keepfolder.txt b/src/vs/code/test/node/fixtures/vscode_folder/nested_vscode_folder/_vscode/settings.json similarity index 100% rename from src/vs/code/test/node/fixtures/vscode_folder/nested_vscode_folder/_vscode/keepfolder.txt rename to src/vs/code/test/node/fixtures/vscode_folder/nested_vscode_folder/_vscode/settings.json diff --git a/src/vs/code/test/node/windowsFinder.test.ts b/src/vs/code/test/node/windowsFinder.test.ts index 2c0b84336ff..6084a62ee43 100644 --- a/src/vs/code/test/node/windowsFinder.test.ts +++ b/src/vs/code/test/node/windowsFinder.test.ts @@ -149,18 +149,6 @@ suite('WindowsFinder', () => { })), path.join(fixturesFolder, 'vscode_folder', 'nested_vscode_folder')); }); - test('VSCode folder in home folder needs settings.json', () => { - // Because ~/.vscode/extensions is used for extensions, ~/.vscode is not enough as a hint. - assert.equal(findBestWindowOrFolderForFile(options({ - filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt'), - userHome: path.join(fixturesFolder, 'vscode_folder') - })), null); - assert.equal(findBestWindowOrFolderForFile(options({ - filePath: path.join(fixturesFolder, 'vscode_home_folder', 'file.txt'), - userHome: path.join(fixturesFolder, 'vscode_home_folder') - })), path.join(fixturesFolder, 'vscode_home_folder')); - }); - test('Workspace folder wins', () => { const window = { lastFocusTime: 1, openedWorkspace: testWorkspace }; assert.equal(findBestWindowOrFolderForFile(options({