diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts index 26570e62197..e9792a68a96 100644 --- a/test/scripts/docker-build-helper.test.ts +++ b/test/scripts/docker-build-helper.test.ts @@ -23,6 +23,7 @@ const PLUGINS_DOCKER_E2E_PATH = "scripts/e2e/plugins-docker.sh"; const PLUGINS_DOCKER_SWEEP_PATH = "scripts/e2e/lib/plugins/sweep.sh"; const PLUGINS_DOCKER_MARKETPLACE_PATH = "scripts/e2e/lib/plugins/marketplace.sh"; const PLUGINS_DOCKER_CLAWHUB_PATH = "scripts/e2e/lib/plugins/clawhub.sh"; +const PLUGINS_DOCKER_ASSERTIONS_PATH = "scripts/e2e/lib/plugins/assertions.mjs"; const PLUGIN_UPDATE_DOCKER_E2E_PATH = "scripts/e2e/plugin-update-unchanged-docker.sh"; const PLUGIN_UPDATE_SCENARIO_PATH = "scripts/e2e/lib/plugin-update/unchanged-scenario.sh"; const PLUGIN_UPDATE_PROBE_PATH = "scripts/e2e/lib/plugin-update/probe.mjs"; @@ -140,6 +141,7 @@ describe("docker build helper", () => { const pluginsSweep = readFileSync(PLUGINS_DOCKER_SWEEP_PATH, "utf8"); const pluginsMarketplace = readFileSync(PLUGINS_DOCKER_MARKETPLACE_PATH, "utf8"); const pluginsClawhub = readFileSync(PLUGINS_DOCKER_CLAWHUB_PATH, "utf8"); + const pluginsAssertions = readFileSync(PLUGINS_DOCKER_ASSERTIONS_PATH, "utf8"); const pluginUpdateScenario = readFileSync(PLUGIN_UPDATE_SCENARIO_PATH, "utf8"); const pluginUpdateProbe = readFileSync(PLUGIN_UPDATE_PROBE_PATH, "utf8"); const packageCompat = readFileSync(PACKAGE_COMPAT_PATH, "utf8"); @@ -171,9 +173,7 @@ describe("docker build helper", () => { "Package $package_version must support gateway install --wrapper.", ); expect(scripts.join("\n")).toContain("expected persisted update.channel dev"); - expect(scripts.join("\n")).toContain( - "expected modern installRecords in installed plugin index", - ); + expect(pluginsAssertions).toContain("expected modern installRecords in installed plugin index"); }); it("keeps bundled plugin install/uninstall sweep chunkable", () => { diff --git a/test/scripts/plugin-prerelease-test-plan.test.ts b/test/scripts/plugin-prerelease-test-plan.test.ts index c45e9d431ab..771b760b8b4 100644 --- a/test/scripts/plugin-prerelease-test-plan.test.ts +++ b/test/scripts/plugin-prerelease-test-plan.test.ts @@ -88,6 +88,10 @@ describe("scripts/lib/plugin-prerelease-test-plan.mjs", () => { const lane = findLaneByName("kitchen-sink-plugin"); const script = readFileSync("scripts/e2e/kitchen-sink-plugin-docker.sh", "utf8"); const sweepScript = readFileSync("scripts/e2e/lib/kitchen-sink-plugin/sweep.sh", "utf8"); + const assertionsScript = readFileSync( + "scripts/e2e/lib/kitchen-sink-plugin/assertions.mjs", + "utf8", + ); expect(lane).toEqual( expect.objectContaining({ @@ -106,9 +110,9 @@ describe("scripts/lib/plugin-prerelease-test-plan.mjs", () => { expect(sweepScript).toContain('plugins install "$KITCHEN_SINK_SPEC"'); expect(sweepScript).toContain('plugins uninstall "$KITCHEN_SINK_SPEC" --force'); expect(sweepScript).toContain("run_failure_scenario"); - expect(sweepScript).toContain("record.source !== source"); - expect(sweepScript).toContain("record.clawhubPackage !== packageName"); - expect(sweepScript).toContain("expectedErrorMessages"); + expect(assertionsScript).toContain("record.source !== source"); + expect(assertionsScript).toContain("record.clawhubPackage !== packageName"); + expect(assertionsScript).toContain("expectedErrorMessages"); expect(script).toContain("docker stats --no-stream"); expect(sweepScript).toContain("scan_logs_for_unexpected_errors"); });