Skip to content

Commit 4a752d2

Browse files
authored
Moves mock GitHub API to /common (#2728)
* Move mock GitHub API to /common * Rename MRVA mock scenarios * Update mock GitHub API docs
1 parent 36259b2 commit 4a752d2

File tree

137 files changed

+35
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+35
-32
lines changed

docs/testing.md

Lines changed: 1 addition & 1 deletion

extensions/ql-vscode/scripts/add-fields-to-scenarios.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import { Octokit, type RestEndpointMethodTypes } from "@octokit/rest";
1818
import { throttling } from "@octokit/plugin-throttling";
1919

2020
import { getFiles } from "./util/files";
21-
import type { GitHubApiRequest } from "../src/variant-analysis/gh-api/mocks/gh-api-request";
22-
import { isGetVariantAnalysisRequest } from "../src/variant-analysis/gh-api/mocks/gh-api-request";
21+
import type { GitHubApiRequest } from "../src/common/mock-gh-api/gh-api-request";
22+
import { isGetVariantAnalysisRequest } from "../src/common/mock-gh-api/gh-api-request";
2323
import { VariantAnalysis } from "../src/variant-analysis/gh-api/variant-analysis";
2424
import { RepositoryWithMetadata } from "../src/variant-analysis/gh-api/repository";
2525

2626
const extensionDirectory = resolve(__dirname, "..");
2727
const scenariosDirectory = resolve(
2828
extensionDirectory,
29-
"src/variant-analysis/gh-api/mocks/scenarios",
29+
"src/common/mock-gh-api/scenarios",
3030
);
3131

3232
// Make sure we don't run into rate limits by automatically waiting until we can

extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const scenarioName = process.argv[2];
2222
const extensionDirectory = resolve(__dirname, "..");
2323
const scenariosDirectory = resolve(
2424
extensionDirectory,
25-
"src/variant-analysis/gh-api/mocks/scenarios",
25+
"src/common/mock-gh-api/scenarios",
2626
);
2727
const scenarioDirectory = resolve(scenariosDirectory, scenarioName);
2828

extensions/ql-vscode/scripts/lint-scenarios.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const extensionDirectory = resolve(__dirname, "..");
1010
const rootDirectory = resolve(extensionDirectory, "../..");
1111
const scenariosDirectory = resolve(
1212
extensionDirectory,
13-
"src/variant-analysis/gh-api/mocks/scenarios",
13+
"src/common/mock-gh-api/scenarios",
1414
);
1515

1616
const debug = process.env.RUNNER_DEBUG || process.argv.includes("--debug");
@@ -19,7 +19,7 @@ async function lintScenarios() {
1919
const schema = createGenerator({
2020
path: resolve(
2121
extensionDirectory,
22-
"src/variant-analysis/gh-api/mocks/gh-api-request.ts",
22+
"src/common/mock-gh-api/gh-api-request.ts",
2323
),
2424
tsconfig: resolve(extensionDirectory, "tsconfig.json"),
2525
type: "GitHubApiRequest",

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/gh-api-request.ts renamed to extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import { Repository } from "../repository";
2-
import { VariantAnalysis, VariantAnalysisRepoTask } from "../variant-analysis";
1+
import { Repository } from "../../variant-analysis/gh-api/repository";
2+
import {
3+
VariantAnalysis,
4+
VariantAnalysisRepoTask,
5+
} from "../../variant-analysis/gh-api/variant-analysis";
36

47
// Types that represent requests/responses from the GitHub API
58
// that we need to mock.

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts renamed to extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { join, resolve } from "path";
22
import { pathExists } from "fs-extra";
33
import { setupServer, SetupServer } from "msw/node";
44

5-
import { DisposableObject } from "../../../common/disposable-object";
5+
import { DisposableObject } from "../disposable-object";
66

77
import { Recorder } from "./recorder";
88
import { createRequestHandlers } from "./request-handlers";
9-
import { getDirectoryNamesInsidePath } from "../../../common/files";
9+
import { getDirectoryNamesInsidePath } from "../files";
1010

1111
/**
1212
* Enables mocking of the GitHub API server via HTTP interception, using msw.
@@ -129,11 +129,11 @@ export class MockGitHubApiServer extends DisposableObject {
129129

130130
public async getDefaultScenariosPath(): Promise<string | undefined> {
131131
// This should be the directory where package.json is located
132-
const rootDirectory = resolve(__dirname, "../../../..");
132+
const rootDirectory = resolve(__dirname, "../../..");
133133

134134
const scenariosPath = resolve(
135135
rootDirectory,
136-
"src/variant-analysis/gh-api/mocks/scenarios",
136+
"src/common/mock-gh-api/scenarios",
137137
);
138138
if (await pathExists(scenariosPath)) {
139139
return scenariosPath;

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/recorder.ts renamed to extensions/ql-vscode/src/common/mock-gh-api/recorder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IsomorphicResponse } from "@mswjs/interceptors";
88
import { Headers } from "headers-polyfill";
99
import fetch from "node-fetch";
1010

11-
import { DisposableObject } from "../../../common/disposable-object";
11+
import { DisposableObject } from "../disposable-object";
1212

1313
import {
1414
GetVariantAnalysisRepoResultRequest,

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/request-handlers.ts renamed to extensions/ql-vscode/src/common/mock-gh-api/request-handlers.ts

File renamed without changes.

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/0-autoModel.json renamed to extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/0-autoModel.json

File renamed without changes.

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/1-autoModel.json renamed to extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/1-autoModel.json

File renamed without changes.

0 commit comments

Comments
 (0)