emit more specific status codes on video upload (#3423)

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

diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index e3029f1aeb4af3591e4bbd0d6a8e342599c88824..f754df04e104d6861608ddc9ab3d7020497f212e 100644 (file)
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -37,9 +37,11 @@ import {
   addVideoCommentThread,
   deleteVideoComment,
   getVideoCommentThreads,
-  getVideoThreadComments
+  getVideoThreadComments,
+  findCommentId
 } from '../../../../shared/extra-utils/videos/video-comments'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 const expect = chai.expect
 
@@ -157,7 +159,7 @@ describe('Test multiple servers', function () {
     })
 
     it('Should upload the video on server 2 and propagate on each server', async function () {
-      this.timeout(50000)
+      this.timeout(100000)
 
       const user = {
         username: 'user1',
@@ -215,19 +217,19 @@ describe('Test multiple servers', function () {
           files: [
             {
               resolution: 240,
-              size: 189000
+              size: 270000
             },
             {
               resolution: 360,
-              size: 278000
+              size: 359000
             },
             {
               resolution: 480,
-              size: 384000
+              size: 465000
             },
             {
               resolution: 720,
-              size: 706000
+              size: 788000
             }
           ],
           thumbnailfile: 'thumbnail',
@@ -575,7 +577,7 @@ describe('Test multiple servers', function () {
     })
 
     it('Should like and dislikes videos on different services', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       await rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like')
       await wait(500)
@@ -590,6 +592,7 @@ describe('Test multiple servers', function () {
       await rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[0], 'like')
 
       await waitJobs(servers)
+      await wait(5000)
 
       let baseVideos = null
       for (const server of servers) {
@@ -773,8 +776,7 @@ describe('Test multiple servers', function () {
       await waitJobs(servers)
 
       {
-        const res = await getVideoCommentThreads(servers[1].url, videoUUID, 0, 5)
-        const threadId = res.body.data.find(c => c.text === 'my super first comment').id
+        const threadId = await findCommentId(servers[1].url, videoUUID, 'my super first comment')
 
         const text = 'my super answer to thread 1'
         await addVideoCommentReply(servers[1].url, servers[1].accessToken, videoUUID, threadId, text)
@@ -783,8 +785,7 @@ describe('Test multiple servers', function () {
       await waitJobs(servers)
 
       {
-        const res1 = await getVideoCommentThreads(servers[2].url, videoUUID, 0, 5)
-        const threadId = res1.body.data.find(c => c.text === 'my super first comment').id
+        const threadId = await findCommentId(servers[2].url, videoUUID, 'my super first comment')
 
         const res2 = await getVideoThreadComments(servers[2].url, videoUUID, threadId)
         const childCommentId = res2.body.children[0].comment.id
@@ -999,7 +1000,7 @@ describe('Test multiple servers', function () {
         expect(res.body.downloadEnabled).to.be.false
 
         const text = 'my super forbidden comment'
-        await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, 409)
+        await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, HttpStatusCode.CONFLICT_409)
       }
     })
   })
@@ -1021,7 +1022,7 @@ describe('Test multiple servers', function () {
       const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm')
 
       await req.attach('videofile', filePath)
-               .expect(200)
+               .expect(HttpStatusCode.OK_200)
 
       await waitJobs(servers)