Merge branch 'main' into aeisenberg/unrevert-query-filters

2022-08-10 15:22:40 -07:00 · 2022-08-10 15:22:40 -07:00 · 44f42da9ca
commit 44f42da9ca
parent 2a70419420 a6d09016e7
1787 changed files with 206897 additions and 1744 deletions
--- a/lib/util.test.js
+++ b/lib/util.test.js
@ -245,7 +245,6 @@ for (const [packs, expectedStatus] of ML_POWERED_JS_STATUS_TESTS) {
                pathsIgnore: [],
                originalUserInput: {},
                tempDir: tmpDir,
-                toolCacheDir: tmpDir,
                codeQLCmd: "",
                gitHubVersion: {
                    type: util.GitHubVariant.DOTCOM,
@ -258,6 +257,7 @@ for (const [packs, expectedStatus] of ML_POWERED_JS_STATUS_TESTS) {
                debugArtifactName: util.DEFAULT_DEBUG_ARTIFACT_NAME,
                debugDatabaseName: util.DEFAULT_DEBUG_DATABASE_NAME,
                injectedMlQueries: false,
+                trapCaches: {},
            };
            t.is(util.getMlPoweredJsQueriesStatus(config), expectedStatus);
        });