refactor(test): dedupe env override assertions in skills e2e

src/agents/skills.e2e.test.ts

@@ -46,6 +46,30 @@ const writeSkill = async (params: SkillFixture) => {
   );
 };
 
+const withClearedEnv = <T>(
+  keys: string[],
+  run: (original: Record<string, string | undefined>) => T,
+): T => {
+  const original: Record<string, string | undefined> = {};
+  for (const key of keys) {
+    original[key] = process.env[key];
+    delete process.env[key];
+  }
+
+  try {
+    return run(original);
+  } finally {
+    for (const key of keys) {
+      const value = original[key];
+      if (value === undefined) {
+        delete process.env[key];
+      } else {
+        process.env[key] = value;
+      }
+    }
+  }
+};
+
 afterEach(async () => {
   await Promise.all(
     tempDirs.splice(0, tempDirs.length).map((dir) => fs.rm(dir, { recursive: true, force: true })),
@@ -242,9 +266,7 @@ describe("applySkillEnvOverrides", () => {
       managedSkillsDir: path.join(workspaceDir, ".managed"),
     });
 
-    const originalEnv = process.env.ENV_KEY;
+    withClearedEnv(["ENV_KEY"], () => {
-    delete process.env.ENV_KEY;
-
       const restore = applySkillEnvOverrides({
         skills: entries,
         config: { skills: { entries: { "env-skill": { apiKey: "injected" } } } },
@@ -254,13 +276,10 @@ describe("applySkillEnvOverrides", () => {
         expect(process.env.ENV_KEY).toBe("injected");
       } finally {
         restore();
-      if (originalEnv === undefined) {
         expect(process.env.ENV_KEY).toBeUndefined();
-      } else {
-        expect(process.env.ENV_KEY).toBe(originalEnv);
-      }
       }
     });
+  });
 
   it("applies env overrides from snapshots", async () => {
     const workspaceDir = await makeWorkspace();
@@ -277,9 +296,7 @@ describe("applySkillEnvOverrides", () => {
       config: { skills: { entries: { "env-skill": { apiKey: "snap-key" } } } },
     });
 
-    const originalEnv = process.env.ENV_KEY;
+    withClearedEnv(["ENV_KEY"], () => {
-    delete process.env.ENV_KEY;
-
       const restore = applySkillEnvOverridesFromSnapshot({
         snapshot,
         config: { skills: { entries: { "env-skill": { apiKey: "snap-key" } } } },
@@ -289,13 +306,10 @@ describe("applySkillEnvOverrides", () => {
         expect(process.env.ENV_KEY).toBe("snap-key");
       } finally {
         restore();
-      if (originalEnv === undefined) {
         expect(process.env.ENV_KEY).toBeUndefined();
-      } else {
-        expect(process.env.ENV_KEY).toBe(originalEnv);
-      }
       }
     });
+  });
 
   it("blocks unsafe env overrides but allows declared secrets", async () => {
     const workspaceDir = await makeWorkspace();
@@ -312,11 +326,7 @@ describe("applySkillEnvOverrides", () => {
       managedSkillsDir: path.join(workspaceDir, ".managed"),
     });
 
-    const originalApiKey = process.env.OPENAI_API_KEY;
+    withClearedEnv(["OPENAI_API_KEY", "NODE_OPTIONS"], () => {
-    const originalNodeOptions = process.env.NODE_OPTIONS;
-    delete process.env.OPENAI_API_KEY;
-    delete process.env.NODE_OPTIONS;
-
       const restore = applySkillEnvOverrides({
         skills: entries,
         config: {
@@ -340,18 +350,9 @@ describe("applySkillEnvOverrides", () => {
         restore();
         expect(process.env.OPENAI_API_KEY).toBeUndefined();
         expect(process.env.NODE_OPTIONS).toBeUndefined();
-      if (originalApiKey === undefined) {
-        delete process.env.OPENAI_API_KEY;
-      } else {
-        process.env.OPENAI_API_KEY = originalApiKey;
-      }
-      if (originalNodeOptions === undefined) {
-        delete process.env.NODE_OPTIONS;
-      } else {
-        process.env.NODE_OPTIONS = originalNodeOptions;
-      }
       }
     });
+  });
 
   it("blocks dangerous host env overrides even when declared", async () => {
     const workspaceDir = await makeWorkspace();
@@ -367,11 +368,7 @@ describe("applySkillEnvOverrides", () => {
       managedSkillsDir: path.join(workspaceDir, ".managed"),
     });
 
-    const originalBashEnv = process.env.BASH_ENV;
+    withClearedEnv(["BASH_ENV", "SHELL"], () => {
-    const originalShell = process.env.SHELL;
-    delete process.env.BASH_ENV;
-    delete process.env.SHELL;
-
       const restore = applySkillEnvOverrides({
         skills: entries,
         config: {
@@ -393,18 +390,11 @@ describe("applySkillEnvOverrides", () => {
         expect(process.env.SHELL).toBeUndefined();
       } finally {
         restore();
-      if (originalBashEnv === undefined) {
         expect(process.env.BASH_ENV).toBeUndefined();
-      } else {
-        expect(process.env.BASH_ENV).toBe(originalBashEnv);
-      }
-      if (originalShell === undefined) {
         expect(process.env.SHELL).toBeUndefined();
-      } else {
-        expect(process.env.SHELL).toBe(originalShell);
-      }
       }
     });
+  });
 
   it("allows required env overrides from snapshots", async () => {
     const workspaceDir = await makeWorkspace();
@@ -416,15 +406,11 @@ describe("applySkillEnvOverrides", () => {
       metadata: '{"openclaw":{"requires":{"env":["OPENAI_API_KEY"]}}}',
     });
 
-    const originalApiKey = process.env.OPENAI_API_KEY;
-    process.env.OPENAI_API_KEY = "seed-present";
-
     const snapshot = buildWorkspaceSkillSnapshot(workspaceDir, {
       managedSkillsDir: path.join(workspaceDir, ".managed"),
     });
 
-    delete process.env.OPENAI_API_KEY;
+    withClearedEnv(["OPENAI_API_KEY"], () => {
-
       const restore = applySkillEnvOverridesFromSnapshot({
         snapshot,
         config: {
@@ -445,11 +431,7 @@ describe("applySkillEnvOverrides", () => {
       } finally {
         restore();
         expect(process.env.OPENAI_API_KEY).toBeUndefined();
-      if (originalApiKey === undefined) {
-        delete process.env.OPENAI_API_KEY;
-      } else {
-        process.env.OPENAI_API_KEY = originalApiKey;
-      }
       }
     });
   });
+});