X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fhandle-down.ts;h=4cedeb89efd61e758e31a4626a4bafcb6b74c52c;hb=81ebea48bfba2d81e62dd7a0f01a0cadf41d2607;hp=f8ba8bd6648252ea911f3d4f097dc3f607a58a02;hpb=7ae71355c40e9065f83d3fc77b6750d1929ac201;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts
index f8ba8bd66..4cedeb89e 100644
--- a/server/tests/api/server/handle-down.ts
+++ b/server/tests/api/server/handle-down.ts
@@ -2,8 +2,10 @@
 
 import * as chai from 'chai'
 import 'mocha'
+import { JobState } from '../../../../shared/models'
 import { VideoPrivacy } from '../../../../shared/models/videos'
-import { completeVideoCheck, runServer, viewVideo } from '../../utils'
+import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import { completeVideoCheck, getVideo, immutableAssign, reRunServer, viewVideo } from '../../utils'
 
 import {
   flushAndRunMultipleServers, flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo,
@@ -11,11 +13,20 @@ import {
 } from '../../utils/index'
 import { follow, getFollowersListPaginationAndSort } from '../../utils/server/follows'
 import { getJobsListPaginationAndSort } from '../../utils/server/jobs'
+import {
+  addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads,
+  getVideoThreadComments
+} from '../../utils/videos/video-comments'
 
 const expect = chai.expect
 
 describe('Test handle downs', function () {
   let servers: ServerInfo[] = []
+  const videos = []
+  let threadIdServer1: number
+  let threadIdServer2: number
+  let commentIdServer1: number
+  let commentIdServer2: number
 
   const videoAttributes = {
     name: 'my super name for server 1',
@@ -23,11 +34,16 @@ describe('Test handle downs', function () {
     licence: 4,
     language: 9,
     nsfw: true,
+    privacy: VideoPrivacy.PUBLIC,
     description: 'my super description for server 1',
     tags: [ 'tag1p1', 'tag2p1' ],
     fixture: 'video_short1.webm'
   }
 
+  const unlistedVideoAttributes = immutableAssign(videoAttributes, {
+    privacy: VideoPrivacy.UNLISTED
+  })
+
   const checkAttributes = {
     name: 'my super name for server 1',
     category: 5,
@@ -56,8 +72,12 @@ describe('Test handle downs', function () {
     ]
   }
 
+  const unlistedCheckAttributes = immutableAssign(checkAttributes, {
+    privacy: VideoPrivacy.UNLISTED
+  })
+
   before(async function () {
-    this.timeout(20000)
+    this.timeout(30000)
 
     servers = await flushAndRunMultipleServers(2)
 
@@ -85,9 +105,31 @@ describe('Test handle downs', function () {
     // Kill server 1
     killallServers([ servers[1] ])
 
+    let resVideo = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, unlistedVideoAttributes)
+    videos.push(resVideo.body.video)
+
     // Remove server 2 follower
     for (let i = 0; i < 10; i++) {
-      await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributes)
+      resVideo = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributes)
+      videos.push(resVideo.body.video)
+    }
+
+    await wait(2000)
+
+    await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributes)
+
+    // Add comments to video 2
+    {
+      const text = 'thread 1'
+      let resComment = await addVideoCommentThread(servers[0].url, servers[0].accessToken, videos[1].uuid, text)
+      let comment = resComment.body.comment
+      threadIdServer1 = comment.id
+
+      resComment = await addVideoCommentReply(servers[0].url, servers[0].accessToken, videos[1].uuid, comment.id, 'comment 1-1')
+      comment = resComment.body.comment
+
+      resComment = await addVideoCommentReply(servers[0].url, servers[0].accessToken, videos[1].uuid, comment.id, 'comment 1-2')
+      commentIdServer1 = resComment.body.comment.id
     }
 
     await wait(10000)
@@ -98,17 +140,18 @@ describe('Test handle downs', function () {
   })
 
   it('Should not have pending/processing jobs anymore', async function () {
-    const res = await getJobsListPaginationAndSort(servers[0].url, servers[0].accessToken, 0, 50, '-createdAt')
-    const jobs = res.body.data
+    const states: JobState[] = [ 'inactive', 'active' ]
 
-    for (const job of jobs) {
-      expect(job.state).not.to.equal('pending')
-      expect(job.state).not.to.equal('processing')
+    for (const state of states) {
+      const res = await getJobsListPaginationAndSort(servers[ 0 ].url, servers[ 0 ].accessToken, state,0, 50, '-createdAt')
+      expect(res.body.data).to.have.length(0)
     }
   })
 
   it('Should follow server 1', async function () {
-    servers[1] = await runServer(2)
+    this.timeout(15000)
+
+    await reRunServer(servers[1])
 
     await follow(servers[1].url, [ servers[0].url ], servers[1].accessToken)
 
@@ -120,19 +163,94 @@ describe('Test handle downs', function () {
   })
 
   it('Should send a view to server 2, and automatically fetch the video', async function () {
-    const resVideo = await getVideosList(servers[0].url)
-    const videoServer1 = resVideo.body.data[0]
+    this.timeout(15000)
 
-    await viewVideo(servers[0].url, videoServer1.uuid)
+    await viewVideo(servers[0].url, videos[0].uuid)
 
     await wait(5000)
 
     const res = await getVideosList(servers[1].url)
-    const videoServer2 = res.body.data.find(v => v.url === videoServer1.url)
+    expect(res.body.data).to.be.an('array')
+    // Video is unlisted
+    expect(res.body.data).to.have.lengthOf(1)
+
+    const resVideo = await getVideo(servers[1].url, videos[0].uuid)
+    expect(resVideo.body).not.to.be.undefined
+
+    await completeVideoCheck(servers[1].url, resVideo.body, unlistedCheckAttributes)
+  })
+
+  it('Should send comments on a video to server 2, and automatically fetch the video', async function () {
+    this.timeout(25000)
+
+    await addVideoCommentReply(servers[0].url, servers[0].accessToken, videos[1].uuid, commentIdServer1, 'comment 1-3')
+
+    await wait(5000)
+
+    const resVideo = await getVideo(servers[1].url, videos[0].uuid)
+    expect(resVideo.body).not.to.be.undefined
+
+    await completeVideoCheck(servers[1].url, resVideo.body, unlistedCheckAttributes)
+
+    {
+      let resComment = await getVideoCommentThreads(servers[1].url, videos[1].uuid, 0, 5)
+      expect(resComment.body.data).to.be.an('array')
+      expect(resComment.body.data).to.have.lengthOf(1)
+
+      threadIdServer2 = resComment.body.data[0].id
+
+      resComment = await getVideoThreadComments(servers[1].url, videos[1].uuid, threadIdServer2)
+
+      const tree: VideoCommentThreadTree = resComment.body
+      expect(tree.comment.text).equal('thread 1')
+      expect(tree.children).to.have.lengthOf(1)
+
+      const firstChild = tree.children[0]
+      expect(firstChild.comment.text).to.equal('comment 1-1')
+      expect(firstChild.children).to.have.lengthOf(1)
+
+      const childOfFirstChild = firstChild.children[0]
+      expect(childOfFirstChild.comment.text).to.equal('comment 1-2')
+      expect(childOfFirstChild.children).to.have.lengthOf(1)
+
+      const childOfChildFirstChild = childOfFirstChild.children[0]
+      expect(childOfChildFirstChild.comment.text).to.equal('comment 1-3')
+      expect(childOfChildFirstChild.children).to.have.lengthOf(0)
+
+      commentIdServer2 = childOfChildFirstChild.comment.id
+    }
+  })
+
+  it('Should correctly reply to the comment', async function () {
+    this.timeout(15000)
+
+    await addVideoCommentReply(servers[1].url, servers[1].accessToken, videos[1].uuid, commentIdServer2, 'comment 1-4')
+
+    await wait(5000)
 
-    expect(videoServer2).not.to.be.undefined
+    {
+      const resComment = await getVideoThreadComments(servers[0].url, videos[1].uuid, threadIdServer1)
 
-    await completeVideoCheck(servers[1].url, videoServer2, checkAttributes)
+      const tree: VideoCommentThreadTree = resComment.body
+      expect(tree.comment.text).equal('thread 1')
+      expect(tree.children).to.have.lengthOf(1)
+
+      const firstChild = tree.children[0]
+      expect(firstChild.comment.text).to.equal('comment 1-1')
+      expect(firstChild.children).to.have.lengthOf(1)
+
+      const childOfFirstChild = firstChild.children[0]
+      expect(childOfFirstChild.comment.text).to.equal('comment 1-2')
+      expect(childOfFirstChild.children).to.have.lengthOf(1)
+
+      const childOfChildFirstChild = childOfFirstChild.children[0]
+      expect(childOfChildFirstChild.comment.text).to.equal('comment 1-3')
+      expect(childOfChildFirstChild.children).to.have.lengthOf(1)
+
+      const childOfChildOfChildOfFirstChild = childOfChildFirstChild.children[0]
+      expect(childOfChildOfChildOfFirstChild.comment.text).to.equal('comment 1-4')
+      expect(childOfChildOfChildOfFirstChild.children).to.have.lengthOf(0)
+    }
   })
 
   after(async function () {