diff --git a/src/application/environment/environmentBuild.test.ts b/src/application/environment/environmentBuild.test.ts index 3e196f776d..c96ff1faca 100644 --- a/src/application/environment/environmentBuild.test.ts +++ b/src/application/environment/environmentBuild.test.ts @@ -27,7 +27,6 @@ import { ArtifactFileCleanupFailure } from "../../resources/ArtifactFileOperatio import { writeJsonOutput } from "../../cli/jsonOutput.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { analysisViewRequestSchema } from "../../domain/analysisView/analysisViewRequest.js"; -import { summarizeEnvironmentCoverage } from "../../domain/analysisView/environmentCoverageView.js"; import type { Evidence } from "../../domain/evidence.js"; import { inspectAnalysisViewValidated } from "../analysisView/AnalysisViewService.js"; import { @@ -42,7 +41,6 @@ import { readEnvironmentExportInputs, } from "./environmentExport.js"; import { loadEnvironmentSource } from "./environmentSource.js"; -import { prepareServedState } from "./environmentState.js"; const listFiles = async (root: string): Promise => (await readdir(root, { recursive: true, withFileTypes: true })) @@ -195,38 +193,6 @@ describe("buildEnvironment", () => { }); }); - it("reports the coverage of the state the bundle serves", async () => { - const root = await createTestTempDirectory("rea-environment-build-cov-"); - const evidence = analysisViewCaptureEvidence( - environmentManifestCaptureFixture(), - ); - const built = await buildEnvironment( - await buildInput(root, evidence, { dryRun: true, directory: undefined }), - ); - if (!built.ok) throw built.error; - const manifest = inspectAnalysisViewValidated({ - source: { kind: "inline", evidence }, - view: analysisViewRequestSchema.parse({ - kind: "environment-manifest", - template_rules: [...DEFAULT_BUILD_TEMPLATE_RULES], - }), - }); - if (!manifest.ok) throw manifest.error; - const source = loadEnvironmentSource(manifest.value, evidence); - if (!source.ok) throw source.error; - const { state } = prepareServedState(source.value, evidence); - if (state === undefined) throw new Error("Expected a served state"); - expect(built.value.coverage).toEqual( - summarizeEnvironmentCoverage({ - views: state.views.values(), - writes: state.writes.values(), - }), - ); - expect( - built.value.coverage!.reads.state + built.value.coverage!.reads.recorded, - ).toBe(state.views.size); - }); - it("plans the same files without writing anything on a dry run", async () => { const root = await createTestTempDirectory("rea-environment-build-dry-"); const planned = await buildEnvironment( diff --git a/src/application/environment/environmentBuildReport.test.ts b/src/application/environment/environmentBuildReport.test.ts index 8c3afcbd36..cec10448b5 100644 --- a/src/application/environment/environmentBuildReport.test.ts +++ b/src/application/environment/environmentBuildReport.test.ts @@ -183,25 +183,20 @@ describe("scanCredentialNames body formats", () => { }; const FORM = "application/x-www-form-urlencoded; charset=UTF-8"; - it("reads a form body as the form parser does, by its media type or, without one, by its shape", () => { - for (const mimeType of [FORM, ""]) { - expect( - scanCredentialNames([posted(mimeType, "password=example&")]), - mimeType, - ).toEqual({ - count: 1, - pointers: ["record 3 request /password"], - skipped: NONE_SKIPPED, - }); - expect( - scanCredentialNames([posted(mimeType, "user=a&&flag&token=example")]), - mimeType, - ).toEqual({ - count: 1, - pointers: ["record 3 request /token"], - skipped: NONE_SKIPPED, - }); - } + it.each([ + [ + "declared form media type", + FORM, + "password=example with space&", + "password", + ], + ["unlabelled form shape", "", "user=a&&flag&token=example&", "token"], + ])("reads a form body by its %s", (_source, mimeType, text, field) => { + expect(scanCredentialNames([posted(mimeType, text)])).toEqual({ + count: 1, + pointers: [`record 3 request /${field}`], + skipped: NONE_SKIPPED, + }); }); it("finds nothing in plain text that is not a form", () => { diff --git a/tests/boundary/cli/environmentBuildCli.test.ts b/tests/boundary/cli/environmentBuildCli.test.ts index ca71a7ac04..98aea737a7 100644 --- a/tests/boundary/cli/environmentBuildCli.test.ts +++ b/tests/boundary/cli/environmentBuildCli.test.ts @@ -288,6 +288,7 @@ cliTest( status: "planned", directory: null, next: [], + coverage: { reads: { state: 5, recorded: 9 } }, }); expect(await readdir(root)).toEqual(["grafana.har"]);