mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix tests on Windows

Browse Source
This commit is contained in:
Koen Vlaswinkel
2023-06-16 16:01:25 +02:00
parent 549884d507
commit 5d83ac84e3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/extension-pack-picker.test.ts
View File

@@ -59,9 +59,12 @@ describe("pickExtensionPackModelFile", () => {
})
).path;
extensionPackPath = join(tmpDir, "my-extension-pack");
anotherExtensionPackPath = join(tmpDir, "another-extension-pack");
autoExtensionPackPath = join(tmpDir, "vscode-codeql-java");
// Uri.file(...).fsPath normalizes the filenames so we can properly compare them on Windows
extensionPackPath = Uri.file(join(tmpDir, "my-extension-pack")).fsPath;
anotherExtensionPackPath = Uri.file(
join(tmpDir, "another-extension-pack"),
).fsPath;
autoExtensionPackPath = Uri.file(join(tmpDir, "vscode-codeql-java")).fsPath;
qlPacks = {
"my-extension-pack": [extensionPackPath],
@@ -116,7 +119,7 @@ describe("pickExtensionPackModelFile", () => {
name: "codeql-custom-queries-java",
index: 0,
};
additionalPacks = [tmpDir];
additionalPacks = [Uri.file(tmpDir).fsPath];
workspaceFoldersSpy = jest
.spyOn(workspace, "workspaceFolders", "get")
.mockReturnValue([workspaceFolder]);
@@ -331,7 +334,7 @@ describe("pickExtensionPackModelFile", () => {
},
]);
const newPackDir = join(tmpDir.path, "vscode-codeql-java");
const newPackDir = join(Uri.file(tmpDir.path).fsPath, "vscode-codeql-java");
const cliServer = mockCliServer({}, { models: [], data: {} });
@@ -409,7 +412,7 @@ describe("pickExtensionPackModelFile", () => {
unsafeCleanup: true,
});
const newPackDir = join(tmpDir.path, "new-extension-pack");
const newPackDir = join(Uri.file(tmpDir.path).fsPath, "new-extension-pack");
showQuickPickSpy.mockResolvedValueOnce({
label: "codeql-custom-queries-java",
@@ -485,7 +488,7 @@ describe("pickExtensionPackModelFile", () => {
unsafeCleanup: true,
});
const newPackDir = join(tmpDir.path, "new-extension-pack");
const newPackDir = join(Uri.file(tmpDir.path).fsPath, "new-extension-pack");
showQuickPickSpy.mockResolvedValueOnce({
label: "codeql-custom-queries-java",