Move utils to /shared

[github/Chocobozzz/PeerTube.git] / server / tests / api / users / users-multiple-servers.ts

diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 8b9b63348cc9d6f9662341d3469f51886d3a1c16..006d6cdf0e17da82d395e476bac0bb935620bd15 100644 (file)
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -12,20 +12,21 @@ import {
   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'
+  userLogin
+} from '../../../../shared/utils'
+import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/utils/index'
+import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/utils/users/accounts'
+import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
 import { User } from '../../../../shared/models/users'
 import { VideoChannel } from '../../../../shared/models/videos'
+import { waitJobs } from '../../../../shared/utils/server/jobs'
 
 const expect = chai.expect
 
 describe('Test users with multiple servers', function () {
   let servers: ServerInfo[] = []
   let user: User
+  let userAccountName: string
   let userAccountUUID: string
   let userVideoChannelUUID: string
   let userId: number
@@ -56,12 +57,17 @@ describe('Test users with multiple servers', function () {
         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, userAccessToken)
+      const account: Account = res.body.account
+      userAccountName = account.name + '@' + account.host
+      userAccountUUID = account.uuid
+    }
+
     {
       const res = await getMyUserInformation(servers[ 0 ].url, servers[ 0 ].accessToken)
       const user: User = res.body
@@ -73,7 +79,7 @@ describe('Test users with multiple servers', function () {
       videoUUID = resVideo.body.video.uuid
     }
 
-    await wait(5000)
+    await waitJobs(servers)
   })
 
   it('Should be able to update my display name', async function () {
@@ -89,7 +95,7 @@ describe('Test users with multiple servers', function () {
     user = res.body
     expect(user.account.displayName).to.equal('my super display name')
 
-    await wait(5000)
+    await waitJobs(servers)
   })
 
   it('Should be able to update my description', async function () {
@@ -106,7 +112,7 @@ describe('Test users with multiple servers', function () {
     expect(user.account.displayName).to.equal('my super display name')
     expect(user.account.description).to.equal('my super description updated')
 
-    await wait(5000)
+    await waitJobs(servers)
   })
 
   it('Should be able to update my avatar', async function () {
@@ -125,7 +131,7 @@ describe('Test users with multiple servers', function () {
 
     await testImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png')
 
-    await wait(5000)
+    await waitJobs(servers)
   })
 
   it('Should have updated my profile on other servers too', async function () {
@@ -135,20 +141,26 @@ describe('Test users with multiple servers', function () {
       const rootServer1List = resAccounts.body.data.find(a => a.name === 'root' && a.host === 'localhost:9001') as Account
       expect(rootServer1List).not.to.be.undefined
 
-      const resAccount = await getAccount(server.url, rootServer1List.id)
+      const resAccount = await getAccount(server.url, rootServer1List.name + '@' + rootServer1List.host)
       const rootServer1Get = resAccount.body as Account
       expect(rootServer1Get.name).to.equal('root')
       expect(rootServer1Get.host).to.equal('localhost:9001')
       expect(rootServer1Get.displayName).to.equal('my super display name')
       expect(rootServer1Get.description).to.equal('my super description updated')
 
+      if (server.serverNumber === 1) {
+        expect(rootServer1Get.userId).to.be.a('number')
+      } else {
+        expect(rootServer1Get.userId).to.be.undefined
+      }
+
       await testImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png')
     }
   })
 
   it('Should list account videos', async function () {
     for (const server of servers) {
-      const res = await getAccountVideos(server.url, server.accessToken, userAccountUUID, 0, 5)
+      const res = await getAccountVideos(server.url, server.accessToken, userAccountName, 0, 5)
 
       expect(res.body.total).to.equal(1)
       expect(res.body.data).to.be.an('array')
@@ -168,14 +180,14 @@ describe('Test users with multiple servers', function () {
 
       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'
+        return a.displayName === 'Main user1 channel' && a.host === 'localhost:9001'
       }) as VideoChannel
       expect(videoChannelDeleted).not.to.be.undefined
     }
 
     await removeUser(servers[0].url, userId, servers[0].accessToken)
 
-    await wait(5000)
+    await waitJobs(servers)
 
     for (const server of servers) {
       const resAccounts = await getAccountsList(server.url, '-createdAt')
@@ -185,7 +197,7 @@ describe('Test users with multiple servers', function () {
 
       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'
+        return a.name === 'Main user1 channel' && a.host === 'localhost:9001'
       }) as VideoChannel
       expect(videoChannelDeleted).to.be.undefined
     }
@@ -206,10 +218,5 @@ describe('Test users with multiple servers', function () {
 
   after(async function () {
     killallServers(servers)
-
-    // Keep the logs if the test failed
-    if (this[ 'ok' ]) {
-      await flushTests()
-    }
   })
 })