Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-07-17 16:37:43 +00:00
Code Issues Projects Releases Wiki Activity

test(sync): mock the mixed-source batch port in the disjoint-merge spec

Browse source 
The #8874 spec predates the atomic mixed-source batch and reducer
checkpoint on the store port; its two createSpyObj sites lacked the
methods, so every flow through the local-wins write path threw.
This commit is contained in:
Johannes Millan 2026-07-11 18:55:51 +02:00
parent 291995f343
commit fe544b1f79
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/app/op-log/sync/conflict-resolution.disjoint-merge.spec.ts
View file

@ -82,14 +82,27 @@ describe('ConflictResolutionService — SPAP-14 disjoint-field merge', () => {
mockOpLogStore = jasmine.createSpyObj('OperationLogStoreService', [
'appendBatchSkipDuplicates',
'appendMixedSourceBatchSkipDuplicates',
'appendWithVectorClockUpdate',
'markApplied',
'markRejected',
'markFailed',
'getUnsyncedByEntity',
'mergeRemoteOpClocks',
'markReducersCommittedAndMergeClocks',
]);
mockOpLogStore.mergeRemoteOpClocks.and.resolveTo(undefined);
mockOpLogStore.markReducersCommittedAndMergeClocks.and.resolveTo(undefined);
mockOpLogStore.appendMixedSourceBatchSkipDuplicates.and.callFake(async (batches) => ({
written: batches.flatMap((batch) =>
batch.ops.map((batchOp, index) => ({
seq: index + 1,
op: batchOp,
source: batch.source,
})),
),
skippedCount: 0,
}));
mockOpLogStore.getUnsyncedByEntity.and.resolveTo(new Map());
mockOpLogStore.markRejected.and.resolveTo(undefined);
mockOpLogStore.markApplied.and.resolveTo(undefined);
@ -634,14 +647,27 @@ describe('ConflictResolutionService — SPAP-14 disjoint-field merge', () => {
const opLogStore = jasmine.createSpyObj('OperationLogStoreService', [
'appendBatchSkipDuplicates',
'appendMixedSourceBatchSkipDuplicates',
'appendWithVectorClockUpdate',
'markApplied',
'markRejected',
'markFailed',
'getUnsyncedByEntity',
'mergeRemoteOpClocks',
'markReducersCommittedAndMergeClocks',
]);
opLogStore.mergeRemoteOpClocks.and.resolveTo(undefined);
opLogStore.markReducersCommittedAndMergeClocks.and.resolveTo(undefined);
opLogStore.appendMixedSourceBatchSkipDuplicates.and.callFake(async (batches) => ({
written: batches.flatMap((batch) =>
batch.ops.map((batchOp, index) => ({
seq: index + 1,
op: batchOp,
source: batch.source,
})),
),
skippedCount: 0,
}));
opLogStore.getUnsyncedByEntity.and.resolveTo(new Map());
opLogStore.markRejected.and.resolveTo(undefined);
opLogStore.markApplied.and.resolveTo(undefined);