From 52aafec07347933a26e670390c3f894c5c05e64a Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Thu, 14 May 2026 18:32:40 +0100 Subject: [PATCH] Import and call `runWrapper` normally in `analyze` tests --- src/analyze-action-env.test.ts | 10 ++-------- src/analyze-action-input.test.ts | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/analyze-action-env.test.ts b/src/analyze-action-env.test.ts index fead41f1e..93992c4a8 100644 --- a/src/analyze-action-env.test.ts +++ b/src/analyze-action-env.test.ts @@ -3,6 +3,7 @@ import * as sinon from "sinon"; import * as actionsUtil from "./actions-util"; import * as analyze from "./analyze"; +import { runWrapper } from "./analyze-action"; import * as api from "./api-client"; import * as configUtils from "./config-utils"; import * as gitUtils from "./git-utils"; @@ -62,15 +63,8 @@ test("analyze action with RAM & threads from environment variables", async (t) = const runFinalizeStub = sinon.stub(analyze, "runFinalize"); const runQueriesStub = sinon.stub(analyze, "runQueries"); - // eslint-disable-next-line @typescript-eslint/no-require-imports - const analyzeAction = require("./analyze-action"); - // When analyze-action.ts loads, it runs an async function from the top - // level but does not wait for it to finish. To ensure that calls to - // runFinalize and runQueries are correctly captured by spies, we explicitly - // wait for the action promise to complete before starting verification. - // eslint-disable-next-line @typescript-eslint/no-unsafe-call - await analyzeAction.runWrapper(); + await runWrapper(); t.assert( runFinalizeStub.calledOnceWith( diff --git a/src/analyze-action-input.test.ts b/src/analyze-action-input.test.ts index 23f24bcfa..b0c2f90c0 100644 --- a/src/analyze-action-input.test.ts +++ b/src/analyze-action-input.test.ts @@ -3,6 +3,7 @@ import * as sinon from "sinon"; import * as actionsUtil from "./actions-util"; import * as analyze from "./analyze"; +import { runWrapper } from "./analyze-action"; import * as api from "./api-client"; import * as configUtils from "./config-utils"; import * as gitUtils from "./git-utils"; @@ -60,15 +61,8 @@ test("analyze action with RAM & threads from action inputs", async (t) => { const runFinalizeStub = sinon.stub(analyze, "runFinalize"); const runQueriesStub = sinon.stub(analyze, "runQueries"); - // eslint-disable-next-line @typescript-eslint/no-require-imports - const analyzeAction = require("./analyze-action"); - // When analyze-action.ts loads, it runs an async function from the top - // level but does not wait for it to finish. To ensure that calls to - // runFinalize and runQueries are correctly captured by spies, we explicitly - // wait for the action promise to complete before starting verification. - // eslint-disable-next-line @typescript-eslint/no-unsafe-call - await analyzeAction.runWrapper(); + await runWrapper(); t.assert( runFinalizeStub.calledOnceWith(