Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Fix shareable stale conflict fixture ordering (#6469)

Nick Gomez10aa99f4cf2b
diff --git a/packages/app/tests/integration/stale-external-write-rollback.test.ts b/packages/app/tests/integration/stale-external-write-rollback.test.ts
index 18fa40518..9d1d39abb 100644
--- a/packages/app/tests/integration/stale-external-write-rollback.test.ts
+++ b/packages/app/tests/integration/stale-external-write-rollback.test.ts
@@ -201,11 +201,17 @@ describe('stale external write does not roll back an acknowledged agent write',
});
test('a shareable template stale conflict can be listed, read and resolved', async () => {
- server = await createTestServer({ debounce: 50, maxDebounce: 200 });
const docName = '.ok/templates/stale-template';
const file = `${docName}.md`;
- mkdirSync(join(server.contentDir, '.ok', 'templates'), { recursive: true });
- writeFileSync(join(server.contentDir, file), 'rejected\n');
+ ownedProjectDir = realpathSync(mkdtempSync(join(tmpdir(), 'ok-shareable-template-')));
+ mkdirSync(join(ownedProjectDir, '.ok', 'templates'), { recursive: true });
+ writeFileSync(join(ownedProjectDir, file), 'rejected\n');
+ server = await createTestServer({
+ contentDir: ownedProjectDir,
+ keepContentDir: true,
+ debounce: 50,
+ maxDebounce: 200,
+ });
const state = server.instance.durabilityState;
state.setReconciledBase(docName, 'acknowledged\n');
state.recordStaleExternalWrite(docName, 'rejected\n');