1 files changed, 66 insertions, 20 deletions

diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index bb458f7a5..a7f3aa8d3 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -4,22 +4,33 @@ import * as chai from 'chai'
 import 'mocha'
 import { Account } from '../../../../shared/models/actors'
 import {
-  checkVideoFilesWereRemoved, createUser, doubleFollow, flushAndRunMultipleServers, removeUser, updateMyUser, userLogin,
+  checkVideoFilesWereRemoved,
+  createUser,
+  doubleFollow,
+  flushAndRunMultipleServers,
+  getAccountVideos,
+  getVideoChannelsList,
+  removeUser,
+  updateMyUser,
+  userLogin,
   wait
 } from '../../utils'
 import { flushTests, getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index'
 import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts'
 import { setAccessTokensToServers } from '../../utils/users/login'
+import { User } from '../../../../shared/models/users'
+import { VideoChannel } from '../../../../shared/models/videos'
 
 const expect = chai.expect
 
 describe('Test users with multiple servers', function () {
   let servers: ServerInfo[] = []
-  let user
-  let userUUID
-  let userId
-  let videoUUID
-  let userAccessToken
+  let user: User
+  let userAccountUUID: string
+  let userVideoChannelUUID: string
+  let userId: number
+  let videoUUID: string
+  let userAccessToken: string
 
   before(async function () {
     this.timeout(120000)
@@ -39,17 +50,28 @@ describe('Test users with multiple servers', function () {
     // The root user of server 1 is propagated to servers 2 and 3
     await uploadVideo(servers[0].url, servers[0].accessToken, {})
 
-    const user = {
-      username: 'user1',
-      password: 'password'
+    {
+      const user = {
+        username: 'user1',
+        password: 'password'
+      }
+      const res = await createUser(servers[ 0 ].url, servers[ 0 ].accessToken, user.username, user.password)
+      userAccountUUID = res.body.user.account.uuid
+      userId = res.body.user.id
+
+      userAccessToken = await userLogin(servers[ 0 ], user)
+    }
+
+    {
+      const res = await getMyUserInformation(servers[ 0 ].url, servers[ 0 ].accessToken)
+      const user: User = res.body
+      userVideoChannelUUID = user.videoChannels[0].uuid
     }
-    const resUser = await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
-    userUUID = resUser.body.user.uuid
-    userId = resUser.body.user.id
-    userAccessToken = await userLogin(servers[0], user)
 
-    const resVideo = await uploadVideo(servers[0].url, userAccessToken, {})
-    videoUUID = resVideo.body.uuid
+    {
+      const resVideo = await uploadVideo(servers[ 0 ].url, userAccessToken, {})
+      videoUUID = resVideo.body.video.uuid
+    }
 
     await wait(5000)
   })
@@ -106,14 +128,31 @@ describe('Test users with multiple servers', function () {
     }
   })
 
+  it('Should list account videos', async function () {
+    for (const server of servers) {
+      const res = await getAccountVideos(server.url, server.accessToken, userAccountUUID, 0, 5)
+
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].uuid).to.equal(videoUUID)
+    }
+  })
+
   it('Should remove the user', async function () {
     this.timeout(10000)
 
     for (const server of servers) {
       const resAccounts = await getAccountsList(server.url, '-createdAt')
 
-      const userServer1List = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account
-      expect(userServer1List).not.to.be.undefined
+      const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account
+      expect(accountDeleted).not.to.be.undefined
+
+      const resVideoChannels = await getVideoChannelsList(server.url, 0, 10)
+      const videoChannelDeleted = resVideoChannels.body.data.find(a => {
+        return a.displayName === 'Default user1 channel' && a.host === 'localhost:9001'
+      }) as VideoChannel
+      expect(videoChannelDeleted).not.to.be.undefined
     }
 
     await removeUser(servers[0].url, userId, servers[0].accessToken)
@@ -123,14 +162,21 @@ describe('Test users with multiple servers', function () {
     for (const server of servers) {
       const resAccounts = await getAccountsList(server.url, '-createdAt')
 
-      const userServer1List = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account
-      expect(userServer1List).to.be.undefined
+      const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account
+      expect(accountDeleted).to.be.undefined
+
+      const resVideoChannels = await getVideoChannelsList(server.url, 0, 10)
+      const videoChannelDeleted = resVideoChannels.body.data.find(a => {
+        return a.name === 'Default user1 channel' && a.host === 'localhost:9001'
+      }) as VideoChannel
+      expect(videoChannelDeleted).to.be.undefined
     }
   })
 
   it('Should not have actor files', async () => {
     for (const server of servers) {
-      await checkActorFilesWereRemoved(userUUID, server.serverNumber)
+      await checkActorFilesWereRemoved(userAccountUUID, server.serverNumber)
+      await checkActorFilesWereRemoved(userVideoChannelUUID, server.serverNumber)
     }
   })