Refactoring: Introduce common method to stub a config

This means that we don't need to update irrelevant test cases when we
add a new configuration property.
This commit is contained in:
Henry Mercer 2024-01-30 18:57:41 +00:00
parent ec42edcaab
commit d2e867f3be
18 changed files with 114 additions and 207 deletions

View file

@ -12,9 +12,9 @@ import {
getTrapCachingExtractorConfigArgsForLang,
} from "./codeql";
import * as configUtils from "./config-utils";
import { Config } from "./config-utils";
import { Language } from "./languages";
import {
createTestConfig,
getRecordingLogger,
makeVersionInfo,
setupTests,
@ -69,49 +69,23 @@ const stubCodeql = setCodeQL({
},
});
const testConfigWithoutTmpDir: Config = {
const testConfigWithoutTmpDir = createTestConfig({
languages: [Language.javascript, Language.cpp],
originalUserInput: {},
tempDir: "",
codeQLCmd: "",
gitHubVersion: {
type: util.GitHubVariant.DOTCOM,
} as util.GitHubVersion,
dbLocation: "",
debugMode: false,
debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
augmentationProperties: {
packsInputCombines: false,
queriesInputCombines: false,
},
trapCaches: {
javascript: "/some/cache/dir",
},
trapCacheDownloadTime: 0,
};
});
function getTestConfigWithTempDir(tmpDir: string): configUtils.Config {
return {
function getTestConfigWithTempDir(tempDir: string): configUtils.Config {
return createTestConfig({
languages: [Language.javascript, Language.ruby],
originalUserInput: {},
tempDir: tmpDir,
codeQLCmd: "",
gitHubVersion: { type: util.GitHubVariant.DOTCOM } as util.GitHubVersion,
dbLocation: path.resolve(tmpDir, "codeql_databases"),
debugMode: false,
debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
augmentationProperties: {
packsInputCombines: false,
queriesInputCombines: false,
},
tempDir,
dbLocation: path.resolve(tempDir, "codeql_databases"),
trapCaches: {
javascript: path.resolve(tmpDir, "jsCache"),
ruby: path.resolve(tmpDir, "rubyCache"),
javascript: path.resolve(tempDir, "jsCache"),
ruby: path.resolve(tempDir, "rubyCache"),
},
trapCacheDownloadTime: 0,
};
});
}
test("check flags for JS, analyzing default branch", async (t) => {