@atproto/api 0.6.20 → 0.6.21

package/tests/bsky-agent.test.ts

@@ -1,23 +1,17 @@
-import {
-  CloseFn,
-  runTestServer,
-  TestServerInfo,
-} from '@atproto/pds/tests/_util'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { BskyAgent, ComAtprotoRepoPutRecord, AppBskyActorProfile } from '..'
 
 describe('agent', () => {
-  let server: TestServerInfo
-  let close: CloseFn
+  let network: TestNetworkNoAppView
 
   beforeAll(async () => {
-    server = await runTestServer({
+    network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'bsky_agent',
     })
-    close = server.close
   })
 
   afterAll(async () => {
-    await close()
+    await network.close()
   })
 
   const getProfileDisplayName = async (
@@ -35,7 +29,7 @@ describe('agent', () => {
   }
 
   it('upsertProfile correctly creates and updates profiles.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user1.test',
@@ -67,7 +61,7 @@ describe('agent', () => {
   })
 
   it('upsertProfile correctly handles CAS failures.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user2.test',
@@ -106,7 +100,7 @@ describe('agent', () => {
   })
 
   it('upsertProfile wont endlessly retry CAS failures.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user3.test',
@@ -135,7 +129,7 @@ describe('agent', () => {
   })
 
   it('upsertProfile validates the record.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user4.test',
@@ -153,70 +147,70 @@ describe('agent', () => {
 
   describe('app', () => {
     it('should retrieve the api app', () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       expect(agent.app).toBe(agent.api.app)
     })
   })
 
   describe('post', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.post({ text: 'foo' })).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deletePost', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deletePost('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('like', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.like('foo', 'bar')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deleteLike', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deleteLike('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('repost', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.repost('foo', 'bar')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deleteRepost', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deleteRepost('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('follow', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.follow('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deleteFollow', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deleteFollow('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('preferences methods', () => {
     it('gets and sets preferences correctly', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
 
       await agent.createAccount({
         handle: 'user5.test',
@@ -714,7 +708,7 @@ describe('agent', () => {
     })
 
     it('resolves duplicates correctly', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
 
       await agent.createAccount({
         handle: 'user6.test',

package/tests/errors.test.ts

@@ -1,25 +1,19 @@
-import {
-  CloseFn,
-  runTestServer,
-  TestServerInfo,
-} from '@atproto/pds/tests/_util'
 import { AtpAgent, ComAtprotoServerCreateAccount } from '..'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 
 describe('errors', () => {
-  let server: TestServerInfo
+  let network: TestNetworkNoAppView
   let client: AtpAgent
-  let close: CloseFn
 
   beforeAll(async () => {
-    server = await runTestServer({
+    network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'known_errors',
     })
-    client = new AtpAgent({ service: server.url })
-    close = server.close
+    client = network.pds.getClient()
   })
 
   afterAll(async () => {
-    await close()
+    await network.close()
   })
 
   it('constructs the correct error instance', async () => {

package/tests/rich-text-detection.test.ts

@@ -295,10 +295,10 @@ describe('detectFacets', () => {
       const rt = new RichText({ text: input })
       await rt.detectFacets(agent)
 
-      let detectedTags: string[] = []
-      let detectedIndices: { byteStart: number; byteEnd: number }[] = []
+      const detectedTags: string[] = []
+      const detectedIndices: { byteStart: number; byteEnd: number }[] = []
 
-      for (const { facet, ...rest } of rt.segments()) {
+      for (const { facet } of rt.segments()) {
         if (!facet) continue
         for (const feature of facet.features) {
           if (isTag(feature)) {

package/tests/util/index.ts

@@ -135,6 +135,7 @@ export const mock = {
     mutedByList,
     blockedBy,
     blocking,
+    blockingByList,
     following,
     followedBy,
   }: {
@@ -142,6 +143,7 @@ export const mock = {
     mutedByList?: AppBskyGraphDefs.ListViewBasic
     blockedBy?: boolean
     blocking?: string
+    blockingByList?: AppBskyGraphDefs.ListViewBasic
     following?: string
     followedBy?: string
   }): AppBskyActorDefs.ViewerState {
@@ -150,6 +152,7 @@ export const mock = {
       mutedByList,
       blockedBy,
       blocking,
+      blockingByList,
       following,
       followedBy,
     }

package/tests/util/moderation-behavior.ts

@@ -25,6 +25,10 @@ expect.extend({
       if (actual.cause.source.type === 'list') {
         cause = 'muted-by-list'
       }
+    } else if (actual.cause?.type === 'blocking') {
+      if (actual.cause.source.type === 'list') {
+        cause = 'blocking-by-list'
+      }
     }
     if (!expected) {
       if (!ignoreCause && actual.cause) {
@@ -153,8 +157,12 @@ export class ModerationBehaviorSuiteRunner {
           ? m.listViewBasic({ name: 'Fake List' })
           : undefined,
         blockedBy: def.blockedBy,
-        blocking: def.blocking
-          ? 'at://did:web:self.test/app.bsky.graph.block/fake'
+        blocking:
+          def.blocking || def.blockingByList
+            ? 'at://did:web:self.test/app.bsky.graph.block/fake'
+            : undefined,
+        blockingByList: def.blockingByList
+          ? m.listViewBasic({ name: 'Fake List' })
           : undefined,
       }),
     })