Skip to content

Commit bc01d73

Browse files
committed
Fix some type errors in tests
1 parent db55e9c commit bc01d73

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,9 @@ async function getControllerRepoFromApi(
541541
}
542542
}
543543

544-
export function removeWorkspaceRefs(qlpack: QlPack) {
544+
export function removeWorkspaceRefs(qlpack: {
545+
dependencies: Record<string, string>;
546+
}) {
545547
for (const [key, value] of Object.entries(qlpack.dependencies || {})) {
546548
if (value === "${workspace}") {
547549
qlpack.dependencies[key] = "*";

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { mockedQuickPickItem } from "../../utils/mocking.helpers";
3131
import { QueryLanguage } from "../../../../src/common/query-language";
3232
import { readBundledPack } from "../../utils/bundled-pack-helpers";
3333
import { load } from "js-yaml";
34+
import { ExtensionPackMetadata } from "../../../../src/model-editor/extension-pack-metadata";
3435

3536
describe("Variant Analysis Manager", () => {
3637
let cli: CodeQLCliServer;
@@ -379,7 +380,9 @@ describe("Variant Analysis Manager", () => {
379380
: "codeql-pack.yml";
380381
const qlpackContents = load(
381382
packFS.fileContents(packFileName).toString("utf-8"),
382-
);
383+
) as ExtensionPackMetadata & {
384+
dependencies: Record<string, string>;
385+
};
383386
expect(qlpackContents.name).toEqual(expectedPackName);
384387
if (checkVersion) {
385388
expect(qlpackContents.version).toEqual("0.0.0");
@@ -393,7 +396,9 @@ describe("Variant Analysis Manager", () => {
393396
}
394397
const qlpackLockContents = load(
395398
packFS.fileContents("codeql-pack.lock.yml").toString("utf-8"),
396-
);
399+
) as {
400+
dependencies: Record<string, string>;
401+
};
397402

398403
const actualLockKeys = Object.keys(qlpackLockContents.dependencies);
399404

extensions/ql-vscode/test/vscode-tests/global.helper.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ export async function fixWorkspaceReferences(
8989
): Promise<Record<string, string> | undefined> {
9090
if (!(await cli.cliConstraints.supportsWorkspaceReferences())) {
9191
// remove the workspace references from the qlpack
92-
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8"));
92+
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8")) as {
93+
dependencies: Record<string, string>;
94+
};
9395
const originalDeps = { ...qlpack.dependencies };
9496
removeWorkspaceRefs(qlpack);
9597
writeFileSync(qlpackFileWithWorkspaceRefs, dump(qlpack));
@@ -113,7 +115,9 @@ export async function restoreWorkspaceReferences(
113115
if (!originalDeps) {
114116
return;
115117
}
116-
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8"));
118+
const qlpack = load(readFileSync(qlpackFileWithWorkspaceRefs, "utf8")) as {
119+
dependencies: Record<string, string>;
120+
};
117121
qlpack.dependencies = originalDeps;
118122
writeFileSync(qlpackFileWithWorkspaceRefs, dump(qlpack));
119123
}

0 commit comments

Comments
 (0)