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: Fixed default migration logic

Browse Source
This commit is contained in:
Laurent Cozic
2021-10-28 22:25:27 +01:00
parent 9704e75614
commit e247be1fa7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/lib/models/Setting.test.ts
View File

@ -226,6 +226,14 @@ describe('models/Setting', function() {
expect(Setting.value('style.editor.contentMaxWidth')).toBe(600); // Changed expect(Setting.value('style.editor.contentMaxWidth')).toBe(600); // Changed
})); }));
it('should skip values that are already set', (async () => {
await Setting.reset();
Setting.setValue('sync.target', 9);
Setting.applyDefaultMigrations();
expect(Setting.value('sync.target')).toBe(9); // Not changed
}));
it('should allow skipping default migrations', (async () => { it('should allow skipping default migrations', (async () => {
await Setting.reset(); await Setting.reset();

2
packages/lib/models/Setting.ts
View File

@ -1457,7 +1457,7 @@ class Setting extends BaseModel {
} }
public static isSet(key: string) { public static isSet(key: string) {
return key in this.cache_; return this.cache_.find(d => d.key === key);
} }
static keyDescription(key: string, appType: AppType = null) { static keyDescription(key: string, appType: AppType = null) {