mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-11-03 14:58:18 +00:00
Use document IDs in received-conflict fixtures
This commit is contained in:
1 parent
8aa0438c77
commit
f596d90e1b
1 file changed
+5
-1
@@ -242,7 +242,11 @@ describe("HiddenFileSync conflict queue", () => {
|
|||||||
expect(hiddenFileSync.showJSONMergeDialogAndMerge).toHaveBeenCalledOnce();
|
expect(hiddenFileSync.showJSONMergeDialogAndMerge).toHaveBeenCalledOnce();
|
||||||
|
|
||||||
resolved = target === "same";
|
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);
|
expect(await hiddenFileSync._anyProcessOptionalSyncFiles(incoming)).toBe(true);
|
||||||
await vi.advanceTimersByTimeAsync(100);
|
await vi.advanceTimersByTimeAsync(100);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user