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,Mobile: Resolves #10073, #10080: Fix conflicts notebook doesn't work with the trash feature (#10104)

Browse Source
This commit is contained in:
Henry Heino
2024-03-14 11:30:49 -07:00
committed by GitHub
parent 8eea3953f3
commit c16ce1c434
16 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/lib/models/Note.test.ts
View File

@ -14,6 +14,7 @@ import * as ArrayUtils from '../ArrayUtils';
import { ErrorCode } from '../errors';
import SearchEngine from '../services/search/SearchEngine';
import { getTrashFolderId } from '../services/trash';
import getConflictFolderId from './utils/getConflictFolderId';
async function allItems() {
const folders = await Folder.all();
@ -581,4 +582,26 @@ describe('models/Note', () => {
}
});
it('should allow deleting conflicts to the trash', async () => {
const folder = await Folder.save({});
const notes = [];
for (let i = 0; i < 3; i++) {
notes.push(await Note.save({ title: `note${i}`, parent_id: folder.id, is_conflict: 1 }));
}
// Should be in the conflicts folder
expect(await Note.previews(getTrashFolderId())).toHaveLength(0);
expect(await Note.previews(getConflictFolderId())).toHaveLength(3);
expect(await Note.conflictedCount()).toBe(3);
// Should be moved to the trash folder on delete
for (const note of notes) {
await Note.delete(note.id, { toTrash: true });
}
expect(await Note.previews(getTrashFolderId())).toHaveLength(3);
expect(await Note.previews(getConflictFolderId())).toHaveLength(0);
expect(await Note.conflictedCount()).toBe(0);
});
});