public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-07-29 07:52:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reserve setup initialisation before enabling settings

Browse Source
This commit is contained in:
vorotamoroz
2026-07-20 14:20:10 +00:00
parent 7faf51a6c4
commit 40a4987b0b
6 changed files with 222 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/features/SetupManager.unit.spec.ts
+73 -2
View File
@@ -98,8 +98,14 @@ function createSetupManager() {
const core: any = {
_services: services,
rebuilder: {
scheduleRebuild: vi.fn(() => Promise.resolve()),
scheduleFetch: vi.fn(() => Promise.resolve()),
scheduleRebuild: vi.fn(async (prepareBeforeRestart?: () => Promise<void>) => {
await prepareBeforeRestart?.();
return true;
}),
scheduleFetch: vi.fn(async (prepareBeforeRestart?: () => Promise<void>) => {
await prepareBeforeRestart?.();
return true;
}),
},
};
Object.defineProperty(core, "services", {
@@ -169,4 +175,69 @@ describe("SetupManager", () => {
);
expect(setting.currentSettings().activeConfigurationId).toBe("legacy-couchdb");
});
it("reserves Rebuild before saving a new-user configuration", async () => {
const { manager, setting, dialogManager, core } = createSetupManager();
setting.settings = { ...setting.currentSettings(), isConfigured: false };
const applyExternalSettings = vi.spyOn(setting, "applyExternalSettings");
dialogManager.openWithExplicitCancel.mockResolvedValueOnce(true);
await manager.onConfirmApplySettingsFromWizard(
{ ...createLegacyRemoteSetting(), isConfigured: true },
UserMode.NewUser
);
expect(core.rebuilder.scheduleRebuild).toHaveBeenCalledWith(expect.any(Function));
expect(core.rebuilder.scheduleRebuild.mock.invocationCallOrder[0]).toBeLessThan(
applyExternalSettings.mock.invocationCallOrder[0]
);
expect(setting.currentSettings().isConfigured).toBe(true);
});
it("reserves Fetch when compatible imported settings activate an unconfigured device", async () => {
const { manager, setting, dialogManager, core } = createSetupManager();
setting.settings = { ...setting.currentSettings(), isConfigured: false };
const applyExternalSettings = vi.spyOn(setting, "applyExternalSettings");
dialogManager.openWithExplicitCancel
.mockResolvedValueOnce({ ...createLegacyRemoteSetting(), isConfigured: true })
.mockResolvedValueOnce("compatible-existing-user");
await manager.onUseSetupURI(UserMode.Unknown, "mock-config://settings");
expect(core.rebuilder.scheduleFetch).toHaveBeenCalledWith(expect.any(Function));
expect(core.rebuilder.scheduleFetch.mock.invocationCallOrder[0]).toBeLessThan(
applyExternalSettings.mock.invocationCallOrder[0]
);
expect(setting.currentSettings().isConfigured).toBe(true);
});
it("applies compatible settings to an already configured device without scheduling Fetch", async () => {
const { manager, setting, dialogManager, core } = createSetupManager();
setting.settings = { ...setting.currentSettings(), isConfigured: true };
dialogManager.openWithExplicitCancel
.mockResolvedValueOnce({ ...createLegacyRemoteSetting(), isConfigured: true })
.mockResolvedValueOnce("compatible-existing-user");
await manager.onUseSetupURI(UserMode.Unknown, "mock-config://settings");
expect(core.rebuilder.scheduleFetch).not.toHaveBeenCalled();
expect(setting.currentSettings().isConfigured).toBe(true);
});
it("does not enable imported settings when the initialisation flag cannot be reserved", async () => {
const { manager, setting, dialogManager, core } = createSetupManager();
setting.settings = { ...setting.currentSettings(), isConfigured: false };
const applyExternalSettings = vi.spyOn(setting, "applyExternalSettings");
core.rebuilder.scheduleRebuild.mockResolvedValueOnce(false);
dialogManager.openWithExplicitCancel.mockResolvedValueOnce(true);
await manager.onConfirmApplySettingsFromWizard(
{ ...createLegacyRemoteSetting(), isConfigured: true },
UserMode.NewUser
);
expect(core.rebuilder.scheduleRebuild).toHaveBeenCalledWith(expect.any(Function));
expect(applyExternalSettings).not.toHaveBeenCalled();
expect(setting.currentSettings().isConfigured).toBe(false);
});
});