@atproto/bsky 0.0.248 → 0.0.250

package/tests/views/bookmarks.test.ts

@@ -56,6 +56,9 @@ describe('appview bookmarks views', () => {
 
   afterEach(async () => {
     vi.resetAllMocks()
+    // Drain pending bsync ops before clearing, so a stale op can't land after
+    // the reset.
+    await network.processAll()
     await clearPrivateData(db)
     await clearBookmarks(db)
   })
@@ -114,6 +117,7 @@ describe('appview bookmarks views', () => {
 
       await create(bob, sc.posts[bob][0].ref)
       await create(bob, sc.posts[carol][0].ref)
+      await network.processAll()
 
       const { data: dataAlice } = await get(alice)
       expect(dataAlice.bookmarks).toHaveLength(3)
@@ -126,10 +130,12 @@ describe('appview bookmarks views', () => {
       const uri = sc.posts[alice][0].ref
 
       await create(alice, uri)
+      await network.processAll()
       const { data: data0 } = await get(alice)
       expect(data0.bookmarks).toHaveLength(1)
 
       await create(alice, uri)
+      await network.processAll()
       const { data: data1 } = await get(alice)
       expect(data1.bookmarks).toHaveLength(1)
     })
@@ -147,12 +153,14 @@ describe('appview bookmarks views', () => {
       await create(alice, sc.posts[alice][0].ref)
       await create(alice, sc.posts[bob][0].ref)
       await create(alice, sc.posts[carol][0].ref)
+      await network.processAll()
 
       const { data: dataBefore } = await get(alice)
       expect(dataBefore.bookmarks).toHaveLength(3)
 
       await del(alice, sc.posts[alice][0].ref)
       await del(alice, sc.posts[carol][0].ref)
+      await network.processAll()
 
       const { data: dataAfter } = await get(alice)
       expect(dataAfter.bookmarks).toHaveLength(1)
@@ -161,12 +169,17 @@ describe('appview bookmarks views', () => {
     it('is idempotent', async () => {
       const uri = sc.posts[alice][0].ref
       await create(alice, uri)
+      // deleteBookmark resolves the bookmark's key from indexed state, so the
+      // create must be indexed before the delete is issued.
+      await network.processAll()
 
       await del(alice, uri)
+      await network.processAll()
       const { data: data0 } = await get(alice)
       expect(data0.bookmarks).toHaveLength(0)
 
       await del(alice, uri)
+      await network.processAll()
       const { data: data1 } = await get(alice)
       expect(data1.bookmarks).toHaveLength(0)
     })
@@ -192,12 +205,14 @@ describe('appview bookmarks views', () => {
       expect(postBefore.viewer?.bookmarked).toBe(false)
 
       await create(alice, ref)
+      await network.processAll()
       const postAfterCreate = await getPost(alice, ref)
       expect(postAfterCreate.viewer?.bookmarked).toBe(true)
       const postAfterCreateForBob = await getPost(bob, ref)
       expect(postAfterCreateForBob.viewer?.bookmarked).toBe(false)
 
       await del(alice, ref)
+      await network.processAll()
       const postAfterDel = await getPost(alice, ref)
       expect(postAfterDel.viewer?.bookmarked).toBe(false)
     })
@@ -210,16 +225,19 @@ describe('appview bookmarks views', () => {
 
       await create(alice, uri)
       await create(carol, uri)
+      await network.processAll()
       const postAfterCreate = await getPost(alice, uri)
       expect(postAfterCreate.bookmarkCount).toBe(2)
       const postAfterCreateForBob = await getPost(bob, uri)
       expect(postAfterCreateForBob.bookmarkCount).toBe(2)
 
       await del(alice, uri)
+      await network.processAll()
       const postAfterAliceDel = await getPost(alice, uri)
       expect(postAfterAliceDel.bookmarkCount).toBe(1)
 
       await del(carol, uri)
+      await network.processAll()
       const postAfterCarolDel = await getPost(carol, uri)
       expect(postAfterCarolDel.bookmarkCount).toBe(0)
     })
@@ -232,6 +250,7 @@ describe('appview bookmarks views', () => {
       await create(alice, sc.posts[carol][0].ref)
       await create(alice, sc.posts[dan][0].ref)
       await create(alice, sc.posts[dan][1].ref)
+      await network.processAll()
 
       const results = (out: AppBskyBookmarkGetBookmarks.OutputSchema[]) =>
         out.flatMap((res) => res.bookmarks)

package/tests/views/drafts.test.ts

@@ -48,8 +48,13 @@ describe('appview drafts views', () => {
   })
 
   beforeEach(async () => network.processAll())
-  afterEach(async () => vi.resetAllMocks())
-  afterEach(async () => clearDrafts(network.bsky.db))
+  afterEach(async () => {
+    vi.resetAllMocks()
+    // Drain in-flight bsync operations before resetting state directly,
+    // otherwise a late-applied op can resurrect state after the reset.
+    await network.processAll()
+    await clearDrafts(network.bsky.db)
+  })
   afterAll(async () => network?.close())
 
   const makeDraft = (): AppBskyDraftDefs.Draft => ({
@@ -113,6 +118,7 @@ describe('appview drafts views', () => {
 
       await create(bob, makeDraft())
       await create(bob, makeDraft())
+      await network.processAll()
 
       const { data: dataAlice } = await get(alice)
       expect(dataAlice.drafts).toHaveLength(3)
@@ -131,6 +137,7 @@ describe('appview drafts views', () => {
       }
 
       await create(alice, draft)
+      await network.processAll()
       const { data } = await get(alice)
       expect(data.drafts).toHaveLength(1)
       expect(data.drafts[0].draft.posts).toHaveLength(3)
@@ -159,6 +166,7 @@ describe('appview drafts views', () => {
       }
 
       await create(alice, draft1)
+      await network.processAll()
       const { data: data0 } = await get(alice)
       expect(data0.drafts).toHaveLength(1)
       expect(data0.drafts[0].draft.posts[0].text).toBe('First version')
@@ -170,6 +178,7 @@ describe('appview drafts views', () => {
       }
 
       await update(alice, draft2)
+      await network.processAll()
       const { data: data1 } = await get(alice)
       expect(data1.drafts).toHaveLength(1)
       expect(data1.drafts[0].draft.posts[0].text).toBe('Updated version')
@@ -182,6 +191,7 @@ describe('appview drafts views', () => {
       }
 
       await update(alice, nonExistingDraft)
+      await network.processAll()
       const { data } = await get(alice)
       expect(data.drafts).toHaveLength(0)
     })
@@ -192,6 +202,7 @@ describe('appview drafts views', () => {
       await create(alice, makeDraft())
       await create(alice, makeDraft())
       await create(alice, makeDraft())
+      await network.processAll()
 
       const { data: dataBefore } = await get(alice)
       expect(dataBefore.drafts).toHaveLength(3)
@@ -202,6 +213,7 @@ describe('appview drafts views', () => {
 
       await del(alice, draft1Id)
       await del(alice, draft3Id)
+      await network.processAll()
 
       const { data: dataAfter } = await get(alice)
       expect(dataAfter.drafts).toHaveLength(1)
@@ -210,16 +222,19 @@ describe('appview drafts views', () => {
 
     it('is idempotent', async () => {
       await create(alice, makeDraft())
+      await network.processAll()
 
       const { data: data0 } = await get(alice)
       expect(data0.drafts).toHaveLength(1)
       const draftId = data0.drafts[0].id
 
       await del(alice, draftId)
+      await network.processAll()
       const { data: data1 } = await get(alice)
       expect(data1.drafts).toHaveLength(0)
 
       await del(alice, draftId)
+      await network.processAll()
       const { data: data2 } = await get(alice)
       expect(data2.drafts).toHaveLength(0)
     })
@@ -235,6 +250,7 @@ describe('appview drafts views', () => {
       await create(alice, makeDraft())
       await create(alice, makeDraft())
       await create(bob, makeDraft())
+      await network.processAll()
 
       const { data: dataAlice } = await get(alice)
       expect(dataAlice.drafts).toHaveLength(2)
@@ -246,6 +262,7 @@ describe('appview drafts views', () => {
     it('includes timestamps', async () => {
       const beforeCreate = new Date()
       await create(alice, makeDraft())
+      await network.processAll()
       const afterCreate = new Date()
 
       const { data } = await get(alice)
@@ -264,6 +281,7 @@ describe('appview drafts views', () => {
       for (let i = 0; i < 7; i++) {
         await create(alice, makeDraft())
       }
+      await network.processAll()
 
       const results = (out: AppBskyDraftGetDrafts.OutputSchema[]) =>
         out.flatMap((res) => res.drafts)
@@ -319,6 +337,7 @@ describe('appview drafts views', () => {
 
     it('round-trips a draft with embedGallery', async () => {
       await create(alice, galleryDraft(3))
+      await network.processAll()
       const { data } = await get(alice)
       expect(data.drafts).toHaveLength(1)
 
@@ -335,6 +354,7 @@ describe('appview drafts views', () => {
 
     it('updates a draft to add a gallery', async () => {
       await create(alice, { posts: [{ text: 'text only' }] })
+      await network.processAll()
       const { data: before } = await get(alice)
       expect(before.drafts).toHaveLength(1)
       expect(before.drafts[0].draft.posts[0].embedGallery).toBeUndefined()
@@ -344,6 +364,7 @@ describe('appview drafts views', () => {
         id: draftId,
         draft: galleryDraft(2),
       })
+      await network.processAll()
 
       const { data: after } = await get(alice)
       expect(after.drafts).toHaveLength(1)
@@ -353,6 +374,7 @@ describe('appview drafts views', () => {
 
     it('updates a draft to change gallery items', async () => {
       await create(alice, galleryDraft(2))
+      await network.processAll()
       const { data: before } = await get(alice)
       expect(before.drafts[0].draft.posts[0].embedGallery?.items).toHaveLength(
         2,
@@ -363,6 +385,7 @@ describe('appview drafts views', () => {
         id: draftId,
         draft: galleryDraft(5),
       })
+      await network.processAll()
 
       const { data: after } = await get(alice)
       const post = after.drafts[0].draft.posts[0]

package/tests/views/mute-lists.test.ts

@@ -334,6 +334,7 @@ describe('bsky views with mutes from mute lists', () => {
         ),
       },
     )
+    await network.processAll()
 
     const res = await agent.api.app.bsky.graph.getListMutes(
       {},
@@ -392,6 +393,7 @@ describe('bsky views with mutes from mute lists', () => {
         ),
       },
     )
+    await network.processAll()
 
     const res = await agent.api.app.bsky.graph.getListMutes(
       {},

package/tests/views/mutes.test.ts

@@ -275,6 +275,7 @@ describe('mute views', () => {
         encoding: 'application/json',
       },
     )
+    await network.processAll()
 
     const { data: final } = await agent.api.app.bsky.graph.getMutes(
       {},

package/tests/views/notifications.test.ts

@@ -1036,6 +1036,9 @@ describe('notification views', () => {
 
   describe('preferences v2', () => {
     beforeEach(async () => {
+      // Drain pending bsync ops before clearing, so a stale op can't land
+      // after the reset.
+      await network.processAll()
       await clearPrivateData(db)
     })
 
@@ -1354,6 +1357,9 @@ describe('notification views', () => {
     })
 
     beforeEach(async () => {
+      // Drain pending bsync ops before clearing, so a stale op can't land
+      // after the reset.
+      await network.processAll()
       await clearActivitySubscription(db)
     })
 
@@ -1383,6 +1389,7 @@ describe('notification views', () => {
         subject: subjectDid,
         activitySubscription: val,
       })
+      await network.processAll()
 
       const { data: listData } = await list(actorDid)
       expect(listData).toEqual({
@@ -1413,6 +1420,7 @@ describe('notification views', () => {
         subject: subjectDid,
         activitySubscription: valUpdate,
       })
+      await network.processAll()
 
       const { data: listData } = await list(actorDid)
       expect(listData).toEqual({
@@ -1435,10 +1443,12 @@ describe('notification views', () => {
       const valDelete = { post: false, reply: false }
 
       await put(actorDid, subjectDid, valCreate)
+      await network.processAll()
       const { data: list0 } = await list(actorDid)
       expect(list0.subscriptions).toHaveLength(1)
 
       await put(actorDid, subjectDid, valDelete)
+      await network.processAll()
       const { data: list1 } = await list(actorDid)
       expect(list1.subscriptions).toHaveLength(0)
     })
@@ -1454,6 +1464,7 @@ describe('notification views', () => {
       await put(actorDid, eve, val)
       await put(actorDid, fred, val)
       await put(actorDid, blocked, val) // blocked is removed from the list.
+      await network.processAll()
 
       const results = (
         results: AppBskyNotificationListActivitySubscriptions.OutputSchema[],
@@ -1507,24 +1518,29 @@ describe('notification views', () => {
 
         // 'none' declaration.
         await put(viewer, bob, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, bob)).resolves.toBeUndefined()
 
         // 'mutuals' declaration and both follow.
         await put(viewer, carol, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, carol)).resolves.toStrictEqual(
           val,
         )
 
         // 'mutuals' declaration but only actor follows.
         await put(viewer, dan, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, dan)).resolves.toBeUndefined()
 
         // 'mutuals' declaration but only subject follows.
         await put(viewer, eve, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, eve)).resolves.toBeUndefined()
 
         // 'followers' declaration and viewer follows.
         await put(viewer, fred, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, carol)).resolves.toStrictEqual(
           val,
         )