mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-09-01 08:17:07 +00:00
test: cover the non-bulk newest resolution entry point
Reason: - The non-bulk notice regression test should exercise the real resolve-by-newest call path. Changes: - Resolve a mocked conflict through `_anyResolveConflictByNewest` and assert that its success notice remains visible.
This commit is contained in:
committed by
vorotamoroz
parent
32e992db93
commit
8e0d5581f7
@@ -48,8 +48,26 @@ describe("ModuleConflictResolver bulk newest resolution", () => {
|
|||||||
it("retains the success notice for a non-bulk newest resolution", async () => {
|
it("retains the success notice for a non-bulk newest resolution", async () => {
|
||||||
const { module } = createModule();
|
const { module } = createModule();
|
||||||
const path = "example.md" as FilePathWithPrefix;
|
const path = "example.md" as FilePathWithPrefix;
|
||||||
|
module.core.databaseFileAccess.fetchEntryMeta = vi.fn(
|
||||||
|
async (_path: unknown, rev?: string): Promise<MetaEntry> =>
|
||||||
|
({
|
||||||
|
_id: "doc-id",
|
||||||
|
_rev: rev ?? "2-current",
|
||||||
|
path,
|
||||||
|
ctime: 1,
|
||||||
|
mtime: rev ? 1 : 2,
|
||||||
|
size: 0,
|
||||||
|
children: [],
|
||||||
|
type: "plain",
|
||||||
|
eden: {},
|
||||||
|
}) as unknown as MetaEntry
|
||||||
|
);
|
||||||
|
module.core.databaseFileAccess.getConflictedRevs = vi
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValueOnce(["1-old"])
|
||||||
|
.mockResolvedValue([]);
|
||||||
|
|
||||||
await (module as any)._resolveConflictByDeletingRev(path, "2-old", "NEWEST");
|
await (module as any)._anyResolveConflictByNewest(path);
|
||||||
|
|
||||||
expect(module._log).toHaveBeenLastCalledWith(`${path} has been merged automatically`, LOG_LEVEL_NOTICE);
|
expect(module._log).toHaveBeenLastCalledWith(`${path} has been merged automatically`, LOG_LEVEL_NOTICE);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user