Skip to content

Minor test updates for db-panel.test #2802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norascheuch merged 4 commits into from
Sep 28, 2023
Merged

Minor test updates for db-panel.test #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b71246
Replace void with await
norascheuch Sep 11, 2023
f82b51f
Add comment
norascheuch Sep 11, 2023
681a15c
Extract dbConfigFilePath
norascheuch Sep 11, 2023
9aff989
Fix comment
norascheuch Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/databases/ui/db-panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ export class DbPanel extends DisposableObject {
return;
}

void window.withProgress(
await window.withProgress(
{
location: ProgressLocation.Notification,
title: "Searching for repositories... This might take a while",
Expand Down
31 changes: 11 additions & 20 deletions extensions/ql-vscode/test/vscode-tests/activated-extension/databases/db-panel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,25 @@ import { AllCommands } from "../../../../src/common/commands";
jest.setTimeout(60_000);

describe("Db panel UI commands", () => {
// This test has some serious problems:
// - all tests use the same dbConfig file, hence the tests depend on ORDER and have to use the same list name!
// - we depend on highlighted list items when adding a repo to a list. If there's not enough time in between, a test might think a list is highlighted that doesn't exist anymore

let storagePath: string;
let dbConfigFilePath: string;

const commandManager = createVSCodeCommandManager<AllCommands>();

beforeEach(async () => {
const extension = await getActivatedExtension();

storagePath =
extension.ctx.storageUri?.fsPath || extension.ctx.globalStorageUri.fsPath;

dbConfigFilePath = path.join(
storagePath,
DbConfigStore.databaseConfigFileName,
);
});

it("should add new remote db list", async () => {
Expand All @@ -39,10 +50,6 @@ describe("Db panel UI commands", () => {
);

// Check db config
const dbConfigFilePath = path.join(
storagePath,
DbConfigStore.databaseConfigFileName,
);
const dbConfig: DbConfig = await readJson(dbConfigFilePath);
expect(dbConfig.databases.variantAnalysis.repositoryLists).toHaveLength(1);
expect(dbConfig.databases.variantAnalysis.repositoryLists[0].name).toBe(
Expand All @@ -61,10 +68,6 @@ describe("Db panel UI commands", () => {
);

// Check db config
const dbConfigFilePath = path.join(
storagePath,
DbConfigStore.databaseConfigFileName,
);
const dbConfig: DbConfig = await readJson(dbConfigFilePath);
expect(dbConfig.databases.local.lists).toHaveLength(1);
expect(dbConfig.databases.local.lists[0].name).toBe("my-list-1");
Expand All @@ -82,10 +85,6 @@ describe("Db panel UI commands", () => {
);

// Check db config
const dbConfigFilePath = path.join(
storagePath,
DbConfigStore.databaseConfigFileName,
);
const dbConfig: DbConfig = await readJson(dbConfigFilePath);
expect(dbConfig.databases.variantAnalysis.repositories).toHaveLength(1);
expect(dbConfig.databases.variantAnalysis.repositories[0]).toBe(
Expand All @@ -105,10 +104,6 @@ describe("Db panel UI commands", () => {
);

// Check db config
const dbConfigFilePath = path.join(
storagePath,
DbConfigStore.databaseConfigFileName,
);
const dbConfig: DbConfig = await readJson(dbConfigFilePath);
expect(dbConfig.databases.variantAnalysis.owners).toHaveLength(1);
expect(dbConfig.databases.variantAnalysis.owners[0]).toBe("owner1");
Expand All @@ -128,10 +123,6 @@ describe("Db panel UI commands", () => {
);

// Check db config
const dbConfigFilePath = path.join(
storagePath,
DbConfigStore.databaseConfigFileName,
);
const dbConfig: DbConfig = await readJson(dbConfigFilePath);
expect(dbConfig.selected).toBeDefined();
expect(dbConfig.selected).toEqual({
Expand Down