From 0cebd1d28d761cf2fceb2a3a9ed79dff79ea5a8c Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Wed, 29 Jul 2026 13:24:33 +0100
Subject: [PATCH] Add `hasEnv` delayed assertion and use for `getJobUUID` test

---
 src/status-report.test.ts | 15 +++++----------
 src/testing-utils.ts      | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/status-report.test.ts b/src/status-report.test.ts
index 9d0c62efb..17490a60c 100644
--- a/src/status-report.test.ts
+++ b/src/status-report.test.ts
@@ -29,21 +29,16 @@ import { BuildMode, ConfigurationError, withTmpDir, wrapError } from "./util";
 setupTests(test);
 
 test("getJobUUID - generates valid UUIDs", async (t) => {
-  const exportVariableStub: sinon.SinonStub<[string, string], void> =
-    sinon.stub();
-
   await callee(getJobUUID)
     .withArgs()
-    .withActions((env) => {
-      env.exportVariable = exportVariableStub;
-    })
     .logs(t, "Job run UUID is ")
+    .hasEnv(t, (val) => {
+      return {
+        [EnvVar.JOB_RUN_UUID]: val,
+      };
+    })
     .passes((val) => {
       t.true(uuid.validate(val));
-
-      const calls = exportVariableStub.getCalls();
-      t.is(calls.length, 1);
-      t.deepEqual(calls[0].args, [EnvVar.JOB_RUN_UUID, val]);
     });
 });
 
diff --git a/src/testing-utils.ts b/src/testing-utils.ts
index 94c843521..279459275 100644
--- a/src/testing-utils.ts
+++ b/src/testing-utils.ts
@@ -378,6 +378,28 @@ abstract class BaseEnvBuilder<
     return result;
   }
 
+  /**
+   * Adds a delayed check that the environment variables returned by `fn`
+   * are present in the environment after the main assertion passes.
+   */
+  public hasEnv(
+    t: ExecutionContext<unknown>,
+    fn: (
+      value: Awaited<R> | undefined,
+      error: ThrownError<ErrorConstructor | Error> | undefined,
+    ) => Record<string, string | undefined>,
+  ): this {
+    const result = this.clone();
+    result.checks.push(async (env, r) => {
+      const value = r.orElse(undefined);
+      const error = r.isFailure() ? r.value : undefined;
+      const expected = fn(value, error);
+
+      t.like(env.getState().env.get(), expected);
+    });
+    return result;
+  }
+
   /**
    * Adds a delayed check that `messages` are not logged. The check will be
    * performed after the main assertion passes.