fix tests maybe?

automerge · Jul 23, 2024 · b6d70fc · b6d70fc
1 parent 752ff6c
commit b6d70fc
Show file tree

Hide file tree

Showing 4 changed files with 6,644 additions and 5,283 deletions.
diff --git a/packages/automerge-repo/src/Repo.ts b/packages/automerge-repo/src/Repo.ts
@@ -100,9 +100,7 @@ export class Repo extends EventEmitter<RepoEvents> {
         })
       })
 
-      if (this.networkSubsystem.isReady()) {
-        handle.request()
-      } else {
+      if (!this.networkSubsystem.isReady()) {
         handle.awaitNetwork()
         this.networkSubsystem
           .whenReady()
@@ -547,6 +545,7 @@ export class Repo extends EventEmitter<RepoEvents> {
         return this.storageSubsystem!.saveDoc(handle.documentId, doc)
       })
     )
+    return
   }
 }
 

diff --git a/packages/automerge-repo/test/Repo.test.ts b/packages/automerge-repo/test/Repo.test.ts
@@ -253,6 +253,8 @@ describe("Repo", () => {
         storage: storageAdapter,
       })
 
+      await repo.flush()
+
       const bobHandle = repo2.find<TestDoc>(handle.url)
       await bobHandle.whenReady()
       assert.equal(bobHandle.isReady(), true)
@@ -268,7 +270,7 @@ describe("Repo", () => {
 
       assert.equal(handle.isReady(), true)
 
-      await pause(150)
+      await repo.flush()
 
       const repo2 = new Repo({
         storage: storageAdapter,
@@ -420,9 +422,17 @@ describe("Repo", () => {
         })
       }
 
+      await repo.flush()
+
       const storageKeyTypes = storageAdapter.keys().map(k => k.split(".")[1])
-      const storedSnapshotCount = storageKeyTypes.filter(k => k === "snapshot").length
-      assert.equal(storedSnapshotCount, 1, `found ${storedSnapshotCount} snapshots in storage instead of 1`)
+      const storedSnapshotCount = storageKeyTypes.filter(
+        k => k === "snapshot"
+      ).length
+      assert.equal(
+        storedSnapshotCount,
+        1,
+        `found ${storedSnapshotCount} snapshots in storage instead of 1`
+      )
     })
 
     it("can import an existing document", async () => {
@@ -474,8 +484,8 @@ describe("Repo", () => {
       let resume = (documentIds?: DocumentId[]) => {
         const savesToUnblock = documentIds
           ? Array.from(blockedSaves).filter(({ path }) =>
-              documentIds.some(documentId => path.includes(documentId))
-            )
+            documentIds.some(documentId => path.includes(documentId))
+          )
           : Array.from(blockedSaves)
         savesToUnblock.forEach(({ resolve }) => resolve())
       }
@@ -946,6 +956,7 @@ describe("Repo", () => {
       })
       const unsyncedHandle = isolatedRepo.create<TestDoc>()
       const url = unsyncedHandle.url
+      await isolatedRepo.flush()
 
       // Now create a message channel to connect two repos
       const abChannel = new MessageChannel()
@@ -1012,9 +1023,9 @@ describe("Repo", () => {
         const doc =
           Math.random() < 0.5
             ? // heads, create a new doc
-              repo.create<TestDoc>()
+            repo.create<TestDoc>()
             : // tails, pick a random doc
-              (getRandomItem(docs) as DocHandle<TestDoc>)
+            (getRandomItem(docs) as DocHandle<TestDoc>)
 
         // make sure the doc is ready
         if (!doc.isReady()) {
@@ -1129,9 +1140,11 @@ describe("Repo", () => {
       })
       await pause(500)
 
-      // repo has no stored sync state for charlie so we should see 3 sync messages
+      // repo has no stored sync state for charlie so we should see 2 sync messages
       assert.strictEqual(bobSyncMessages, 3)
 
+      await bobRepo.flush()
+
       // setup new repo which uses bob's storage
       const bob2Repo = new Repo({
         storage: bobStorage,
@@ -1242,7 +1255,6 @@ describe("Repo", () => {
     aliceDoc.change((doc: any) => (doc.text = "Hello world"))
 
     const bobDoc = bobRepo.find(aliceDoc.url)
-    bobDoc.unavailable()
     await eventPromise(bobDoc, "unavailable")
 
     aliceAdapter.peerCandidate(bob)
@@ -1396,7 +1408,7 @@ describe("Repo", () => {
 })
 
 const warn = console.warn
-const NO_OP = () => {}
+const NO_OP = () => { }
 
 const disableConsoleWarn = () => {
   console.warn = NO_OP