test: dedupe zai env test setup and cover blank legacy key

This commit is contained in:
Peter Steinberger
2026-02-19 13:48:17 +00:00
parent d9046f0d2a
commit 182ffdf557

View File

@@ -2,48 +2,54 @@ import { describe, expect, it } from "vitest";
import { isTruthyEnvValue, normalizeZaiEnv } from "./env.js"; import { isTruthyEnvValue, normalizeZaiEnv } from "./env.js";
describe("normalizeZaiEnv", () => { describe("normalizeZaiEnv", () => {
it("copies Z_AI_API_KEY to ZAI_API_KEY when missing", () => { function withZaiEnv(env: { zaiApiKey?: string; legacyZaiApiKey?: string }, run: () => void) {
const prevZai = process.env.ZAI_API_KEY; const prevZai = process.env.ZAI_API_KEY;
const prevZAi = process.env.Z_AI_API_KEY; const prevLegacy = process.env.Z_AI_API_KEY;
process.env.ZAI_API_KEY = ""; if (env.zaiApiKey === undefined) {
process.env.Z_AI_API_KEY = "zai-legacy"; delete process.env.ZAI_API_KEY;
} else {
normalizeZaiEnv(); process.env.ZAI_API_KEY = env.zaiApiKey;
}
expect(process.env.ZAI_API_KEY).toBe("zai-legacy"); if (env.legacyZaiApiKey === undefined) {
delete process.env.Z_AI_API_KEY;
} else {
process.env.Z_AI_API_KEY = env.legacyZaiApiKey;
}
try {
run();
} finally {
if (prevZai === undefined) { if (prevZai === undefined) {
delete process.env.ZAI_API_KEY; delete process.env.ZAI_API_KEY;
} else { } else {
process.env.ZAI_API_KEY = prevZai; process.env.ZAI_API_KEY = prevZai;
} }
if (prevZAi === undefined) { if (prevLegacy === undefined) {
delete process.env.Z_AI_API_KEY; delete process.env.Z_AI_API_KEY;
} else { } else {
process.env.Z_AI_API_KEY = prevZAi; process.env.Z_AI_API_KEY = prevLegacy;
} }
}
}
it("copies Z_AI_API_KEY to ZAI_API_KEY when missing", () => {
withZaiEnv({ zaiApiKey: "", legacyZaiApiKey: "zai-legacy" }, () => {
normalizeZaiEnv();
expect(process.env.ZAI_API_KEY).toBe("zai-legacy");
});
}); });
it("does not override existing ZAI_API_KEY", () => { it("does not override existing ZAI_API_KEY", () => {
const prevZai = process.env.ZAI_API_KEY; withZaiEnv({ zaiApiKey: "zai-current", legacyZaiApiKey: "zai-legacy" }, () => {
const prevZAi = process.env.Z_AI_API_KEY;
process.env.ZAI_API_KEY = "zai-current";
process.env.Z_AI_API_KEY = "zai-legacy";
normalizeZaiEnv(); normalizeZaiEnv();
expect(process.env.ZAI_API_KEY).toBe("zai-current"); expect(process.env.ZAI_API_KEY).toBe("zai-current");
});
});
if (prevZai === undefined) { it("ignores blank legacy Z_AI_API_KEY values", () => {
delete process.env.ZAI_API_KEY; withZaiEnv({ zaiApiKey: "", legacyZaiApiKey: " " }, () => {
} else { normalizeZaiEnv();
process.env.ZAI_API_KEY = prevZai; expect(process.env.ZAI_API_KEY).toBe("");
} });
if (prevZAi === undefined) {
delete process.env.Z_AI_API_KEY;
} else {
process.env.Z_AI_API_KEY = prevZAi;
}
}); });
}); });