Add failing regression test

lib/codeql.test.js

@@ -216,66 +216,50 @@ for (const { cliVersion, expectedToolcacheVersion, } of EXPLICITLY_REQUESTED_BUN
         });
     });
 }
-for (const { isCached, tagName, toolcacheCliVersion } of [
+for (const { githubReleases, toolcacheVersion } of [
+    // Test that we use the tools from the toolcache when `SAMPLE_DEFAULT_CLI_VERSION` is requested
+    // and `SAMPLE_DEFAULT_CLI_VERSION-` is in the toolcache.
     {
-        isCached: true,
-        tagName: "codeql-bundle-20230101",
-        toolcacheCliVersion: SAMPLE_DEFAULT_CLI_VERSION.cliVersion,
+        toolcacheVersion: SAMPLE_DEFAULT_CLI_VERSION.cliVersion,
     },
     {
-        isCached: true,
-        // By leaving toolcacheCliVersion undefined, the bundle will be installed
-        // into the toolcache as `${SAMPLE_DEFAULT_CLI_VERSION.cliVersion}-20230101`.
-        // This lets us test that `x.y.z-yyyymmdd` toolcache versions are used if an
-        // `x.y.z` version isn't in the toolcache.
-        tagName: `codeql-bundle-${SAMPLE_DEFAULT_CLI_VERSION.cliVersion}-20230101`,
+        githubReleases: {
+            "codeql-bundle-20230101": `cli-version-${SAMPLE_DEFAULT_CLI_VERSION.cliVersion}.txt`,
+        },
+        toolcacheVersion: "0.0.0-20230101",
     },
     {
-        isCached: false,
-        tagName: "codeql-bundle-20230101",
+        toolcacheVersion: `${SAMPLE_DEFAULT_CLI_VERSION.cliVersion}-20230101`,
     },
 ]) {
-    (0, ava_1.default)(`uses default version on Dotcom when default version bundle ${tagName} is ${isCached ? "" : "not "}cached`, async (t) => {
+    (0, ava_1.default)(`uses tools from toolcache when ${SAMPLE_DEFAULT_CLI_VERSION.cliVersion} is requested and ` +
+        `${toolcacheVersion} is installed`, async (t) => {
         await util.withTmpDir(async (tmpDir) => {
             (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
-            if (isCached) {
-                await installIntoToolcache({
-                    cliVersion: toolcacheCliVersion,
-                    tagName,
-                    isPinned: true,
-                    tmpDir,
-                });
-            }
-            else {
-                mockDownloadApi({
-                    tagName,
-                });
+            sinon
+                .stub(toolcache, "find")
+                .withArgs("CodeQL", toolcacheVersion)
+                .returns("path/to/cached/codeql");
+            sinon.stub(toolcache, "findAllVersions").returns([toolcacheVersion]);
+            if (githubReleases) {
                 sinon.stub(api, "getApiClient").value(() => ({
                     repos: {
                         listReleases: sinon.stub().resolves(undefined),
                     },
-                    paginate: sinon.stub().resolves([
-                        {
-                            assets: [
-                                {
-                                    name: "cli-version-2.0.0.txt",
-                                },
-                            ],
-                            tag_name: tagName,
-                        },
-                    ]),
+                    paginate: sinon.stub().resolves(Object.entries(githubReleases).map(([releaseTagName, cliVersionMarkerFile]) => ({
+                        assets: [
+                            {
+                                name: cliVersionMarkerFile,
+                            },
+                        ],
+                        tag_name: releaseTagName,
+                    }))),
                 }));
             }
             const result = await codeql.setupCodeQL(undefined, sampleApiDetails, tmpDir, util.GitHubVariant.DOTCOM, false, SAMPLE_DEFAULT_CLI_VERSION, (0, logging_1.getRunnerLogger)(true), false);
             t.is(result.toolsVersion, SAMPLE_DEFAULT_CLI_VERSION.cliVersion);
-            if (isCached) {
-                t.is(result.toolsSource, init_1.ToolsSource.Toolcache);
-                t.is(result.toolsDownloadDurationMs, undefined);
-            }
-            else {
-                t.is(result.toolsSource, init_1.ToolsSource.Download);
-                t.is(typeof result.toolsDownloadDurationMs, "number");
-            }
+            t.is(result.toolsSource, init_1.ToolsSource.Toolcache);
+            t.is(result.toolsDownloadDurationMs, undefined);
         });
     });
 }