self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

Desktop: Resolves #8080: Add support for plugin user data (#8312)

Browse Source
This commit is contained in:
Laurent Cozic
2023-06-13 18:06:16 +01:00
committed by GitHub
parent 6424832984
commit 92c68882e2
67 changed files with 13357 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/lib/services/synchronizer/Synchronizer.conflicts.test.ts
View File

@ -46,13 +46,13 @@ describe('Synchronizer.conflicts', () => {
for (const n in conflictedNote) {
if (!conflictedNote.hasOwnProperty(n)) continue;
if (n === 'id' || n === 'is_conflict' || n === 'conflict_original_id') continue;
expect(conflictedNote[n]).toBe(note2conf[n]);
expect(conflictedNote[n]).toBe((note2conf as any)[n]);
}
const noteUpdatedFromRemote = await Note.load(note1.id);
for (const n in noteUpdatedFromRemote) {
if (!noteUpdatedFromRemote.hasOwnProperty(n)) continue;
expect(noteUpdatedFromRemote[n]).toBe(note2[n]);
expect((noteUpdatedFromRemote as any)[n]).toBe((note2 as any)[n]);
}
}));