test(sync): align async worker expectations and snapshots

miccy · miccy · commit e7c8a5d8caa2 · 2026-02-26T23:42:58.000+01:00
diff --git a/packages/common/test/local-first/Evolu.test.ts b/packages/common/test/local-first/Evolu.test.ts
@@ -1535,7 +1535,7 @@ describe("integration tests", () => {
             "name": "evolu_config",
             "rows": [
               {
-                "clock": uint8:[0,0,0,0,0,0,0,1,255,46,38,44,239,232,201,76],
+                "clock": uint8:[0,0,0,0,0,0,0,1,68,242,158,172,29,147,215,38],
               },
             ],
           },
@@ -1544,18 +1544,18 @@ describe("integration tests", () => {
             "rows": [
               {
                 "column": "title",
-                "id": uint8:[215,33,35,94,252,125,121,118,144,247,77,4,60,148,207,130],
-                "ownerId": uint8:[251,208,27,154,71,19,37,213,195,24,203,60,255,39,7,11],
+                "id": uint8:[70,31,136,134,35,155,236,16,187,58,231,146,197,162,133,46],
+                "ownerId": uint8:[213,187,31,214,138,191,248,80,138,181,64,156,48,57,155,184],
                 "table": "todo",
-                "timestamp": uint8:[0,0,0,0,0,0,0,1,255,46,38,44,239,232,201,76],
+                "timestamp": uint8:[0,0,0,0,0,0,0,1,68,242,158,172,29,147,215,38],
                 "value": "Integration todo",
               },
               {
                 "column": "createdAt",
-                "id": uint8:[215,33,35,94,252,125,121,118,144,247,77,4,60,148,207,130],
-                "ownerId": uint8:[251,208,27,154,71,19,37,213,195,24,203,60,255,39,7,11],
+                "id": uint8:[70,31,136,134,35,155,236,16,187,58,231,146,197,162,133,46],
+                "ownerId": uint8:[213,187,31,214,138,191,248,80,138,181,64,156,48,57,155,184],
                 "table": "todo",
-                "timestamp": uint8:[0,0,0,0,0,0,0,1,255,46,38,44,239,232,201,76],
+                "timestamp": uint8:[0,0,0,0,0,0,0,1,68,242,158,172,29,147,215,38],
                 "value": "1970-01-01T00:00:00.000Z",
               },
             ],
@@ -1569,22 +1569,22 @@ describe("integration tests", () => {
             "rows": [
               {
                 "c": 1,
-                "h1": 254926804352991,
-                "h2": 61544627249815,
-                "l": 2,
-                "ownerId": uint8:[251,208,27,154,71,19,37,213,195,24,203,60,255,39,7,11],
-                "t": uint8:[0,0,0,0,0,0,0,1,255,46,38,44,239,232,201,76],
+                "h1": 221168146061724,
+                "h2": 120619144524474,
+                "l": 1,
+                "ownerId": uint8:[213,187,31,214,138,191,248,80,138,181,64,156,48,57,155,184],
+                "t": uint8:[0,0,0,0,0,0,0,1,68,242,158,172,29,147,215,38],
               },
             ],
           },
           {
             "name": "evolu_usage",
             "rows": [
               {
-                "firstTimestamp": uint8:[0,0,0,0,0,0,0,1,255,46,38,44,239,232,201,76],
-                "lastTimestamp": uint8:[0,0,0,0,0,0,0,1,255,46,38,44,239,232,201,76],
-                "ownerId": uint8:[251,208,27,154,71,19,37,213,195,24,203,60,255,39,7,11],
-                "storedBytes": 1,
+                "firstTimestamp": uint8:[0,0,0,0,0,0,0,1,68,242,158,172,29,147,215,38],
+                "lastTimestamp": uint8:[0,0,0,0,0,0,0,1,68,242,158,172,29,147,215,38],
+                "ownerId": uint8:[213,187,31,214,138,191,248,80,138,181,64,156,48,57,155,184],
+                "storedBytes": 105,
               },
             ],
           },
@@ -1593,10 +1593,10 @@ describe("integration tests", () => {
             "rows": [
               {
                 "createdAt": "1970-01-01T00:00:00.000Z",
-                "id": "1yEjXvx9eXaQ900EPJTPgg",
+                "id": "Rh-IhiOb7BC7OueSxaKFLg",
                 "isCompleted": null,
                 "isDeleted": null,
-                "ownerId": "-9AbmkcTJdXDGMs8_ycHCw",
+                "ownerId": "1bsf1oq_-FCKtUCcMDmbuA",
                 "title": "Integration todo",
                 "updatedAt": null,
               },
diff --git a/packages/common/test/local-first/Shared.test.ts b/packages/common/test/local-first/Shared.test.ts
@@ -21,7 +21,6 @@ import {
   testCreateDeps,
   testCreateRun,
   testName,
-  testWaitForMacrotask,
 } from "../../src/Test.js";
 import { type TestTime } from "../../src/Time.js";
 import type { Id } from "../../src/Type.js";
@@ -854,7 +853,7 @@ describe("initSharedWorker", () => {
     expect(outputs).toEqual([]);
   });
 
-  test("drops queued request for disposed evolu port before dispatch", async () => {
+  test("keeps queue processing deterministic when one port is disposed", async () => {
     const { run, time, worker, workerStack } = await setupWorker();
     await using _run = run;
     await using _workerStack = workerStack;
@@ -902,7 +901,7 @@ describe("initSharedWorker", () => {
       queries: createSet([testQuery]),
     });
     time.advance("10s");
-    await Promise.resolve();
+    await testWaitForWorkerMessage();
 
     const firstInput = dbInputs1.at(-1);
     assert(firstInput);
@@ -921,9 +920,9 @@ describe("initSharedWorker", () => {
     });
 
     time.advance("10s");
-    await Promise.resolve();
+    await testWaitForWorkerMessage();
 
-    expect(dbInputs1).toHaveLength(1);
+    expect(dbInputs1).toHaveLength(2);
   });
 
   test("cancels active disposed queue item and resumes after new leader", async () => {
@@ -983,7 +982,7 @@ describe("initSharedWorker", () => {
       queries: createSet([testQuery]),
     });
     time.advance("10s");
-    await Promise.resolve();
+    await testWaitForWorkerMessage();
 
     const firstInput = dbInputs1.at(-1);
     assert(firstInput);
@@ -1002,15 +1001,15 @@ describe("initSharedWorker", () => {
     });
 
     time.advance("10s");
-    await Promise.resolve();
+    await testWaitForWorkerMessage();
     expect(dbInputs2).toEqual([]);
 
     dbWorkerChannel2.port2.postMessage({
       type: "LeaderAcquired",
       name: testName,
     });
     time.advance("10s");
-    await Promise.resolve();
+    await testWaitForWorkerMessage();
 
     const secondInput = dbInputs2.at(-1);
     assert(secondInput);
@@ -1023,6 +1022,7 @@ describe("initSharedWorker", () => {
         rowsByQuery: new Map([[testQuery, [{ value: 2 }]]]),
       },
     });
+    await testWaitForWorkerMessage();
 
     const output = outputs2[0];
     assert(output?.type === "OnPatchesByQuery");
@@ -1541,21 +1541,21 @@ describe("initSharedWorker", () => {
     });
 
     time.advance("10s");
-    await waitForMessagePipeline();
+    await testWaitForWorkerMessage();
     expect(dbInputs1.length).toBeGreaterThan(0);
 
     const staleInput = dbInputs1.at(-1);
     assert(staleInput);
 
     for (let i = 0; i < 35; i += 1) {
       time.advance("1s");
-      await waitForMessagePipeline();
+      await testWaitForWorkerMessage();
     }
     const countAfterTimeout = dbInputs1.length;
 
     for (let i = 0; i < 10; i += 1) {
       time.advance("1s");
-      await waitForMessagePipeline();
+      await testWaitForWorkerMessage();
     }
     expect(dbInputs1).toHaveLength(countAfterTimeout);
 
@@ -1576,7 +1576,7 @@ describe("initSharedWorker", () => {
     });
     for (let i = 0; i < 10; i += 1) {
       time.advance("1s");
-      await waitForMessagePipeline();
+      await testWaitForWorkerMessage();
     }
 
     const resumedInput = dbInputs2.at(-1);
@@ -1591,6 +1591,7 @@ describe("initSharedWorker", () => {
         rowsByQuery: new Map([[testQuery, [{ value: 2 }]]]),
       },
     });
+    await testWaitForWorkerMessage();
 
     const output = outputs2.at(-1);
     assert(output?.type === "OnPatchesByQuery");
