From c970887d5e34eca12c9b6a8198eee8eac3dbd023 Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Tue, 24 Jan 2023 11:20:16 -0800 Subject: [PATCH] cleanup sql project TestProject created by test (#21705) --- .../dialogs/createProjectFromDatabaseQuickpick.test.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/sql-database-projects/src/test/dialogs/createProjectFromDatabaseQuickpick.test.ts b/extensions/sql-database-projects/src/test/dialogs/createProjectFromDatabaseQuickpick.test.ts index fbf613c549..3f3e8400ab 100644 --- a/extensions/sql-database-projects/src/test/dialogs/createProjectFromDatabaseQuickpick.test.ts +++ b/extensions/sql-database-projects/src/test/dialogs/createProjectFromDatabaseQuickpick.test.ts @@ -15,7 +15,7 @@ import * as createProjectFromDatabaseQuickpick from '../../dialogs/createProject import { createTestUtils, mockConnectionInfo, TestUtils } from './testUtils'; import { promises as fs } from 'fs'; import { ImportDataModel } from '../../models/api/import'; -import { createTestFile, deleteGeneratedTestFolder } from '../testUtils'; +import { createTestFile, deleteGeneratedTestFolder, generateTestFolderPath } from '../testUtils'; let testUtils: TestUtils; const projectFilePath = 'test'; @@ -27,8 +27,9 @@ describe('Create Project From Database Quickpick', () => { sinon.stub(utils, 'getVscodeMssqlApi').resolves(testUtils.vscodeMssqlIExtension.object); //set vscode mssql extension api }); - afterEach(function (): void { + afterEach(async function (): Promise { sinon.restore(); + await deleteGeneratedTestFolder(); }); it('Should prompt for connection and exit when connection is not selected', async function (): Promise { @@ -150,9 +151,9 @@ describe('Create Project From Database Quickpick', () => { it('Should exit when folder structure is not selected and existing folder/file location is selected', async function (): Promise { //create folder and project file const projectFileName = 'TestProject'; - const testProjectFilePath = 'TestProjectPath' + const testProjectFilePath = await generateTestFolderPath(); await fs.rm(testProjectFilePath, { force: true, recursive: true }); //clean up if it already exists - await createTestFile('', projectFileName, testProjectFilePath); + await createTestFile('', `${projectFileName}.sqlproj`, testProjectFilePath); //user chooses connection and database sinon.stub(testUtils.vscodeMssqlIExtension.object, 'connect').resolves('testConnectionURI');