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

Chore: Complete Jest upgrade

Browse Source
This commit is contained in:
Laurent Cozic
2022-11-15 10:23:50 +00:00
parent 33b96b4c65
commit 64199704c2
90 changed files with 118 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,11 +8,10 @@ import { setEncryptionEnabled } from '../synchronizer/syncInfoUtils';
describe('Synchronizer.conflicts', function() {
beforeEach(async (done) => {
beforeEach(async () => {
await setupDatabaseAndSynchronizer(1);
await setupDatabaseAndSynchronizer(2);
await switchClient(1);
done();
});
it('should resolve note conflicts', (async () => {