Add ability to cancel & delete video imports

[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 266824d5864937b3c79e7d0f415e241519b256af..2ae52397023d2606a37fd4887f0e6999c44c2006 100644 (file)
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -2,21 +2,13 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import {
-  cleanupTests,
-  CommentsCommand,
-  dateIsValid,
-  flushAndRunServer,
-  ServerInfo,
-  setAccessTokensToServers,
-  testImage,
-  uploadVideo
-} from '@shared/extra-utils'
+import { dateIsValid, testImage } from '@server/tests/shared'
+import { cleanupTests, CommentsCommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } 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
@@ -29,19 +21,19 @@ describe('Test video comments', function () {
   before(async function () {
     this.timeout(30000)
 
-    server = await flushAndRunServer(1)
+    server = await createSingleServer(1)
 
     await setAccessTokensToServers([ server ])
 
-    const res = await uploadVideo(server.url, server.accessToken, {})
-    videoUUID = res.body.video.uuid
-    videoId = res.body.video.id
+    const { id, uuid } = await server.videos.upload()
+    videoUUID = uuid
+    videoId = id
 
-    await server.usersCommand.updateMyAvatar({ fixture: 'avatar.png' })
+    await server.users.updateMyAvatar({ fixture: 'avatar.png' })
 
-    userAccessTokenServer1 = await server.usersCommand.generateUserAndToken('user1')
+    userAccessTokenServer1 = await server.users.generateUserAndToken('user1')
 
-    command = server.commentsCommand
+    command = server.comments
   })
 
   describe('User comments', function () {