@atproto/bsky 0.0.243 → 0.0.244

package/tests/views/likes.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyFeedGetLikes, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, likesSeed } from '@atproto/dev-env'
 import {
@@ -31,18 +31,16 @@ describe('pds like views', () => {
       email: 'frankie@frankie.com',
       password: 'password',
     })
-    await network.processAll()
 
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
     frankie = sc.dids.frankie
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   const getCursors = (items: { createdAt?: string }[]) =>
     items.map((item) => item.createdAt ?? constantDate)
 

package/tests/views/list-feed.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyFeedGetListFeed, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
@@ -33,12 +33,10 @@ describe('list feed views', () => {
     listRef = await sc.createList(alice, 'test list', 'curate')
     await sc.addToList(alice, alice, listRef)
     await sc.addToList(alice, bob, listRef)
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('fetches list feed', async () => {
     const res = await agent.api.app.bsky.feed.getListFeed(

package/tests/views/lists.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyGraphGetLists,
   AppBskyGraphGetListsWithMembership,
@@ -86,7 +86,6 @@ describe('bsky actor likes feed views', () => {
     await sc.block(sc.dids.frankie, sc.dids.greta)
     await sc.block(sc.dids.frankie, sc.dids.eve)
 
-    await network.processAll()
     blockList = newBlockList.uriStr
     curateList = newCurList.uriStr
     referenceList = newRefList.uriStr
@@ -102,9 +101,8 @@ describe('bsky actor likes feed views', () => {
     greta = sc.dids.greta
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('does not include reference lists in getActorLists', async () => {
     const view = await agent.app.bsky.graph.getLists({

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

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtUri, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from '../_util.js'
@@ -29,12 +29,10 @@ describe('bsky views with mutes from mute lists', () => {
     // add follows to ensure mutes work even w follows
     await sc.follow(carol, dan)
     await sc.follow(dan, carol)
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   let listUri: string
   let listCid: string

package/tests/views/mutes.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyGraphGetMutes, AtpAgent, ids } from '@atproto/api'
 import {
   SeedClient,
@@ -54,12 +54,11 @@ describe('mute views', () => {
         },
       )
     }
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   it('flags mutes in threads', async () => {
     const res = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.posts[alice][1].ref.uriStr },

package/tests/views/notifications.test.ts

@@ -91,8 +91,6 @@ describe('notification views', () => {
       password: 'blocked-pass',
     })
 
-    await network.processAll()
-
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
@@ -104,9 +102,8 @@ describe('notification views', () => {
     blocked = sc.dids.blocked
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   const sortNotifs = (
     notifs: AppBskyNotificationListNotifications.Notification[],
@@ -728,12 +725,12 @@ describe('notification views', () => {
     await network.processAll()
   })
 
-  // @NOTE there is some flakyness between these tests. We sometimes get
-  // "priority": true when the snapshot expects false.
-
   it('filters notifications by reason', async () => {
     const res = await agent.app.bsky.notification.listNotifications(
       {
+        // Pin priority so the snapshot doesn't race with the viewer's stored
+        // priority preference, which neighbouring tests mutate.
+        priority: false,
         reasons: ['mention'],
       },
       {
@@ -750,6 +747,9 @@ describe('notification views', () => {
   it('filters notifications by multiple reasons', async () => {
     const res = await agent.app.bsky.notification.listNotifications(
       {
+        // Pin priority so the snapshot doesn't race with the viewer's stored
+        // priority preference, which neighbouring tests mutate.
+        priority: false,
         reasons: ['mention', 'reply'],
       },
       {
@@ -1203,7 +1203,8 @@ describe('notification views', () => {
         },
       }
       const expected0: AppBskyNotificationDefs.Preferences = {
-        chat: input0.chat,
+        // chat is deprecated: input is ignored and the default is always returned.
+        chat: cp,
         follow: fp,
         like: fp,
         likeViaRepost: fp,
@@ -1227,8 +1228,8 @@ describe('notification views', () => {
         },
       }
       const expected1: AppBskyNotificationDefs.Preferences = {
-        // Kept from the previous call.
-        chat: input0.chat,
+        // chat is deprecated: input is ignored and the default is always returned.
+        chat: cp,
         follow: fp,
         like: fp,
         likeViaRepost: fp,

package/tests/views/post-search.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyFeedSearchPosts, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { DatabaseSchema } from '../../src/index.js'
@@ -51,13 +51,8 @@ describe('appview search', () => {
     nonTaggedResults = [post2.ref.uriStr, post0.ref.uriStr]
   })
 
-  afterAll(async () => {
-    await deleteTags(network.bsky.db.db, {
-      uri: post1.ref.uriStr,
-    })
-
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   describe(`post search with 'top' sort`, () => {
     type TestCase = {
@@ -202,19 +197,3 @@ const createTag = async (
     .returningAll()
     .execute()
 }
-
-const deleteTags = async (
-  db: DatabaseSchema,
-  opts: {
-    uri: string
-  },
-) => {
-  await db
-    .updateTable('record')
-    .set({
-      tags: JSON.stringify([]),
-    })
-    .where('uri', '=', opts.uri)
-    .returningAll()
-    .execute()
-}

package/tests/views/posts-debug.test.ts

@@ -1,4 +1,12 @@
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+} from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
@@ -14,16 +22,13 @@ describe('post views w/ debug field', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
   })
 
+  beforeEach(async () => network.processAll())
   afterEach(() => {
     network.bsky.ctx.cfg.debugFieldAllowedDids.clear()
   })
-
-  afterAll(async () => {
-    await network.close()
-  })
+  afterAll(async () => network?.close())
 
   it(`does not include debug field for unauthed requests`, async () => {
     network.bsky.ctx.cfg.debugFieldAllowedDids.add(sc.dids.bob)

package/tests/views/posts.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyEmbedGallery,
   AppBskyEmbedRecord,
@@ -52,9 +52,8 @@ describe('pds posts views', () => {
     })
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('fetches posts', async () => {
     const uris = [

package/tests/views/profile-debug.test.ts

@@ -1,4 +1,12 @@
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+} from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
@@ -16,13 +24,11 @@ describe('profile views w/ debug field', () => {
     await basicSeed(sc)
   })
 
+  beforeEach(async () => network.processAll())
   afterEach(() => {
     network.bsky.ctx.cfg.debugFieldAllowedDids.clear()
   })
-
-  afterAll(async () => {
-    await network.close()
-  })
+  afterAll(async () => network?.close())
 
   it(`does not include debug field for unauthed requests`, async () => {
     network.bsky.ctx.cfg.debugFieldAllowedDids.add(sc.dids.bob)

package/tests/views/profile.test.ts

@@ -1,7 +1,15 @@
 import assert from 'node:assert'
 import fs from 'node:fs/promises'
 import { Timestamp } from '@bufbuild/protobuf'
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+import {
+  afterAll,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest'
 import {
   AppBskyEmbedExternal,
   AtpAgent,
@@ -77,7 +85,6 @@ describe('pds profile views', () => {
       password: 'noprofile-pass',
     })
 
-    await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
     dan = sc.dids.dan
@@ -86,9 +93,8 @@ describe('pds profile views', () => {
     noprofile = sc.dids.noprofile
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   // @TODO(bsky) blocked by actor takedown via labels.
 

package/tests/views/quotes.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, quotesSeed } from '@atproto/dev-env'
 import { forSnapshot } from '../_util.js'
@@ -21,17 +21,15 @@ describe('pds quote views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await quotesSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
     eve = sc.dids.eve
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   it('fetches post quotes', async () => {
     const alicePostQuotes = await agent.api.app.bsky.feed.getQuotes(
       { uri: sc.posts[alice][0].ref.uriStr, limit: 30 },

package/tests/views/reposts.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyFeedGetRepostedBy, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, repostsSeed } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewer } from '../_util.js'
@@ -19,15 +19,13 @@ describe('pds repost views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await repostsSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   it('fetches reposted-by for a post', async () => {
     const view = await agent.api.app.bsky.feed.getRepostedBy(
       { uri: sc.posts[alice][2].ref.uriStr },

package/tests/views/starter-packs.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyActorProfile,
   AppBskyGraphGetStarterPacksWithMembership,
@@ -80,13 +80,10 @@ describe('starter packs', () => {
       [sc.dids.alice, sc.dids.frankie],
       [],
     )
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('gets actor starter packs.', async () => {
     const { data } = await agent.api.app.bsky.graph.getActorStarterPacks({

package/tests/views/suggestions.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { stripViewer } from '../_util.js'
@@ -15,24 +15,20 @@ describe('pds user search views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
-
-    const suggestions = [
-      { did: sc.dids.alice, order: 1 },
-      { did: sc.dids.bob, order: 2 },
-      { did: sc.dids.carol, order: 3 },
-      { did: sc.dids.dan, order: 4 },
-    ]
 
     await network.bsky.db.db
       .insertInto('suggested_follow')
-      .values(suggestions)
+      .values([
+        { did: sc.dids.alice, order: 1 },
+        { did: sc.dids.bob, order: 2 },
+        { did: sc.dids.carol, order: 3 },
+        { did: sc.dids.dan, order: 4 },
+      ])
       .execute()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('actor suggestion gives users', async () => {
     const result = await agent.api.app.bsky.actor.getSuggestions(

package/tests/views/thread-v2.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyUnspeccedDefs,
   AppBskyUnspeccedGetPostThreadOtherV2,
@@ -54,12 +54,10 @@ describe('appview thread views v2', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     labelerDid = network.bsky.ctx.cfg.modServiceDid
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   describe('not found anchor', () => {
     it('returns not found error', async () => {

package/tests/views/thread.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyFeedDefs,
   AppBskyFeedGetPostThread,
@@ -40,17 +40,13 @@ describe('appview thread views', () => {
     await sc.like(alice, sc.replies[alice][0].ref)
     await sc.like(alice, sc.replies[bob][0].ref)
     await sc.like(alice, sc.replies[carol][0].ref)
-  })
 
-  beforeAll(async () => {
     // Add a repost of a reply so that we can confirm myState in the thread
     await sc.repost(bob, sc.replies[alice][0].ref)
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('fetches deep post thread', async () => {
     const thread = await agent.api.app.bsky.feed.getPostThread(

package/tests/views/threadgating.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyFeedDefs, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from '../_util.js'
@@ -23,12 +23,10 @@ describe('views with thread gating', () => {
       email: 'eve@eve.com',
       password: 'hunter2',
     })
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   // check that replyDisabled state is applied correctly in a simple method like getPosts
   const checkReplyDisabled = async (

package/tests/views/timeline.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyFeedDefs,
   AppBskyFeedGetTimeline,
@@ -35,7 +35,7 @@ describe('timeline views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
+
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
@@ -54,9 +54,8 @@ describe('timeline views', () => {
     })
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   // @TODO(bsky) blocks posts, reposts, replies by actor takedown via labels
   // @TODO(bsky) blocks posts, reposts, replies by record takedown via labels

package/tests/views/verification.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyActorDefs, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, verificationsSeed } from '@atproto/dev-env'
 
@@ -41,7 +41,6 @@ describe('verification views', () => {
     sc = network.getSeedClient()
 
     await verificationsSeed(sc)
-    await network.processAll()
 
     labelerDid = network.bsky.ctx.cfg.modServiceDid
     alice = sc.dids.alice
@@ -63,12 +62,11 @@ describe('verification views', () => {
       .set({ trustedVerifier: true })
       .where('did', 'in', [verifier1, verifier2, verifier3])
       .execute()
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   describe('profile views', () => {
     const testCases: ProfileViewTestCase[] = [
       {