2 files changed, 37 insertions, 8 deletions

diff --git a/shared/extra-utils/users/accounts.ts b/shared/extra-utils/users/actors.ts
index 9fc1bcfc4..cfcc7d0a7 100644
--- a/shared/extra-utils/users/accounts.ts
+++ b/shared/extra-utils/users/actors.ts
@@ -4,22 +4,31 @@ import { expect } from 'chai'
 import { pathExists, readdir } from 'fs-extra'
 import { join } from 'path'
 import { root } from '@server/helpers/core-utils'
+import { Account, VideoChannel } from '@shared/models'
 import { PeerTubeServer } from '../server'
 
-async function expectAccountFollows (options: {
+async function expectChannelsFollows (options: {
   server: PeerTubeServer
   handle: string
   followers: number
   following: number
 }) {
-  const { server, handle, followers, following } = options
+  const { server } = options
+  const { data } = await server.channels.list()
 
-  const body = await server.accounts.list()
-  const account = body.data.find(a => a.name + '@' + a.host === handle)
+  return expectActorFollow({ ...options, data })
+}
 
-  const message = `${handle} on ${server.url}`
-  expect(account.followersCount).to.equal(followers, message)
-  expect(account.followingCount).to.equal(following, message)
+async function expectAccountFollows (options: {
+  server: PeerTubeServer
+  handle: string
+  followers: number
+  following: number
+}) {
+  const { server } = options
+  const { data } = await server.accounts.list()
+
+  return expectActorFollow({ ...options, data })
 }
 
 async function checkActorFilesWereRemoved (filename: string, serverNumber: number) {
@@ -40,5 +49,25 @@ async function checkActorFilesWereRemoved (filename: string, serverNumber: numbe
 
 export {
   expectAccountFollows,
+  expectChannelsFollows,
   checkActorFilesWereRemoved
 }
+
+// ---------------------------------------------------------------------------
+
+function expectActorFollow (options: {
+  server: PeerTubeServer
+  data: (Account | VideoChannel)[]
+  handle: string
+  followers: number
+  following: number
+}) {
+  const { server, data, handle, followers, following } = options
+
+  const actor = data.find(a => a.name + '@' + a.host === handle)
+  const message = `${handle} on ${server.url}`
+
+  expect(actor, message).to.exist
+  expect(actor.followersCount).to.equal(followers, message)
+  expect(actor.followingCount).to.equal(following, message)
+}
diff --git a/shared/extra-utils/users/index.ts b/shared/extra-utils/users/index.ts
index fbb454e8f..460a06f70 100644
--- a/shared/extra-utils/users/index.ts
+++ b/shared/extra-utils/users/index.ts
@@ -1,5 +1,5 @@
 export * from './accounts-command'
-export * from './accounts'
+export * from './actors'
 export * from './blocklist-command'
 export * from './login'
 export * from './login-command'