Skip to content

Commit 1f52642

Browse files
committed
Fix rebase problems
1 parent af7ec57 commit 1f52642

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import { join } from "path";
22
import * as vscode from "vscode";
33

44
import { extLogger } from "../../../../src/common";
5-
import {
6-
HistoryTreeDataProvider,
7-
SortOrder,
8-
} from "../../../../src/query-history/history-tree-data-provider";
95
import {
106
QueryHistoryConfig,
117
QueryHistoryConfigListener,
@@ -31,6 +27,12 @@ import { createMockVariantAnalysisHistoryItem } from "../../../factories/query-h
3127
import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item";
3228
import { QueryStatus } from "../../../../src/query-status";
3329
import { VariantAnalysisStatus } from "../../../../src/remote-queries/shared/variant-analysis";
30+
import { Credentials } from "../../../../src/common/authentication";
31+
import { createMockApp } from "../../../__mocks__/appMock";
32+
import {
33+
HistoryTreeDataProvider,
34+
SortOrder,
35+
} from "../../../../src/query-history/history-tree-data-provider";
3436
import { QueryHistoryManager } from "../../../../src/query-history/query-history-manager";
3537

3638
describe("HistoryTreeDataProvider", () => {
@@ -470,8 +472,12 @@ describe("HistoryTreeDataProvider", () => {
470472
});
471473
});
472474

473-
async function createMockQueryHistory(allHistory: QueryHistoryInfo[]) {
475+
async function createMockQueryHistory(
476+
allHistory: QueryHistoryInfo[],
477+
credentials?: Credentials,
478+
) {
474479
const qhm = new QueryHistoryManager(
480+
createMockApp({ credentials }),
475481
{} as QueryRunner,
476482
{} as DatabaseManager,
477483
localQueriesResultsViewStub,

0 commit comments

Comments
 (0)