Fix live constraints tests

[github/Chocobozzz/PeerTube.git] / server / tests / api / videos / video-comments.ts

diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index 41be54c81b2756ec29bdcf9a2c1e06b20508c631..1488ce2b5a32cbedbac9a51231bc85c443ea48dc 100644 (file)
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -2,20 +2,21 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { dateIsValid, testImage } from '@server/tests/shared'
 import {
   cleanupTests,
   CommentsCommand,
-  dateIsValid,
-  flushAndRunServer,
-  ServerInfo,
+  createSingleServer,
+  PeerTubeServer,
   setAccessTokensToServers,
-  testImage
-} from '@shared/extra-utils'
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
 describe('Test video comments', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
   let videoId: number
   let videoUUID: string
   let threadId: number
@@ -28,19 +29,20 @@ describe('Test video comments', function () {
   before(async function () {
     this.timeout(30000)
 
-    server = await flushAndRunServer(1)
+    server = await createSingleServer(1)
 
     await setAccessTokensToServers([ server ])
 
-    const { id, uuid } = await server.videosCommand.upload()
+    const { id, uuid } = await server.videos.upload()
     videoUUID = uuid
     videoId = id
 
-    await server.usersCommand.updateMyAvatar({ fixture: 'avatar.png' })
+    await setDefaultChannelAvatar(server)
+    await setDefaultAccountAvatar(server)
 
-    userAccessTokenServer1 = await server.usersCommand.generateUserAndToken('user1')
+    userAccessTokenServer1 = await server.users.generateUserAndToken('user1')
 
-    command = server.commentsCommand
+    command = server.comments
   })
 
   describe('User comments', function () {
@@ -88,7 +90,9 @@ describe('Test video comments', function () {
       expect(comment.account.name).to.equal('root')
       expect(comment.account.host).to.equal('localhost:' + server.port)
 
-      await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
+      for (const avatar of comment.account.avatars) {
+        await testImage(server.url, `avatar-resized-${avatar.width}x${avatar.width}`, avatar.path, '.png')
+      }
 
       expect(comment.totalReplies).to.equal(0)
       expect(comment.totalRepliesFromVideoAuthor).to.equal(0)