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

Fix some type errors in tests

Browse Source
This commit is contained in:
Koen Vlaswinkel
2023-09-25 15:16:54 +02:00
parent db55e9cd42
commit bc01d73ba5
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/ql-vscode/src/variant-analysis/run-remote-query.ts
View File

@@ -541,7 +541,9 @@ async function getControllerRepoFromApi(
}
}
export function removeWorkspaceRefs(qlpack: QlPack) {
export function removeWorkspaceRefs(qlpack: {
dependencies: Record<string, string>;
}) {
for (const [key, value] of Object.entries(qlpack.dependencies || {})) {
if (value === "${workspace}") {
qlpack.dependencies[key] = "*";

9
extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts
View File

@@ -31,6 +31,7 @@ import { mockedQuickPickItem } from "../../utils/mocking.helpers";
import { QueryLanguage } from "../../../../src/common/query-language";
import { readBundledPack } from "../../utils/bundled-pack-helpers";
import { load } from "js-yaml";
import { ExtensionPackMetadata } from "../../../../src/model-editor/extension-pack-metadata";
describe("Variant Analysis Manager", () => {
let cli: CodeQLCliServer;
@@ -379,7 +380,9 @@ describe("Variant Analysis Manager", () => {
: "codeql-pack.yml";
const qlpackContents = load(
packFS.fileContents(packFileName).toString("utf-8"),
);
) as ExtensionPackMetadata & {
dependencies: Record<string, string>;
};
expect(qlpackContents.name).toEqual(expectedPackName);
if (checkVersion) {
expect(qlpackContents.version).toEqual("0.0.0");
@@ -393,7 +396,9 @@ describe("Variant Analysis Manager", () => {
}
const qlpackLockContents = load(
packFS.fileContents("codeql-pack.lock.yml").toString("utf-8"),
);
) as {
dependencies: Record<string, string>;
};
const actualLockKeys = Object.keys(qlpackLockContents.dependencies);

8
extensions/ql-vscode/test/vscode-tests/global.helper.ts
View File

@@ -89,7 +89,9 @@ export async function fixWorkspaceReferences(
): Promise<Record<string, string> | undefined> {
if (!(await cli.cliConstraints.supportsWorkspaceReferences())) {
// remove the workspace references from the qlpack
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8"));
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8")) as {
dependencies: Record<string, string>;
};
const originalDeps = { ...qlpack.dependencies };
removeWorkspaceRefs(qlpack);
writeFileSync(qlpackFileWithWorkspaceRefs, dump(qlpack));
@@ -113,7 +115,9 @@ export async function restoreWorkspaceReferences(
if (!originalDeps) {
return;
}
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8"));
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8")) as {
dependencies: Record<string, string>;
};
qlpack.dependencies = originalDeps;
writeFileSync(qlpackFileWithWorkspaceRefs, dump(qlpack));
}