From 3e1195d84ef70b242be183c54b1eb727bc6d12ec Mon Sep 17 00:00:00 2001
From: Logan Johnson <loganj@squareup.com>
Date: Tue, 18 Aug 2026 17:47:06 +0000
Subject: [PATCH] test(desktop): cover workstream wait merging

Signed-off-by: loganj <loganj@squareup.com>
---
 .../lib/workstreamWaits.test.mjs              | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/desktop/src/features/workstream-board/lib/workstreamWaits.test.mjs b/desktop/src/features/workstream-board/lib/workstreamWaits.test.mjs
index 4c1732fc19..196c24712e 100644
--- a/desktop/src/features/workstream-board/lib/workstreamWaits.test.mjs
+++ b/desktop/src/features/workstream-board/lib/workstreamWaits.test.mjs
@@ -202,3 +202,24 @@ test("derived reviewer waits cover all unapproved open review states and exclude
   ]);
   assert.equal(deriveReviewerWaits([reference], approved).length, 0);
 });
+
+test("manual wording overlays an identical derived PR key while a deleted manual wait leaves the derived wait", () => {
+  const derived = [
+    {
+      key: "github:block/buzz#4",
+      actor: { kind: "team", name: "Reviewers" },
+      reason: "Review requested",
+      source: "derived",
+    },
+  ];
+  const manual = [
+    {
+      key: "github:block/buzz#4",
+      actor: { kind: "team", name: "Release reviewers" },
+      reason: "Please review release notes",
+      source: "manual",
+    },
+  ];
+  assert.deepEqual(mergeWorkstreamWaits(manual, derived), manual);
+  assert.deepEqual(mergeWorkstreamWaits([], derived), derived);
+});