From f596d90e1be018d0f2007739f6165f23b22e2385 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Sun, 1 Nov 2026 09:50:46 +0000
Subject: [PATCH] Use document IDs in received-conflict fixtures

---
 .../HiddenFileSync/CmdHiddenFileSync.queue.unit.spec.ts     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/features/HiddenFileSync/CmdHiddenFileSync.queue.unit.spec.ts b/src/features/HiddenFileSync/CmdHiddenFileSync.queue.unit.spec.ts
index a7613ee8..7460692c 100644
--- a/src/features/HiddenFileSync/CmdHiddenFileSync.queue.unit.spec.ts
+++ b/src/features/HiddenFileSync/CmdHiddenFileSync.queue.unit.spec.ts
@@ -242,7 +242,11 @@ describe("HiddenFileSync conflict queue", () => {
                 expect(hiddenFileSync.showJSONMergeDialogAndMerge).toHaveBeenCalledOnce();
 
                 resolved = target === "same";
-                const incoming = { _id: incomingPath, path: incomingPath, _rev: "3-received" } as LoadedEntry;
+                const incoming = {
+                    _id: String(incomingPath) as DocumentID,
+                    path: incomingPath,
+                    _rev: "3-received",
+                } as LoadedEntry;
                 expect(await hiddenFileSync._anyProcessOptionalSyncFiles(incoming)).toBe(true);
                 await vi.advanceTimersByTimeAsync(100);