X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fhandle-down.ts;h=84d310ae628e21b4ad7ab92c7acf4ea5c59178cf;hb=94831479f5facff9469540a3d49dd347b88bdf5a;hp=da134c09fd0dbc3e6f2aaa7aea50f8e4c0be68cd;hpb=2ccaeeb341ffe8c2609039bf4c6d8835b4650316;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index da134c09f..84d310ae6 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@ -2,41 +2,67 @@ 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, + flushAndRunMultipleServers, + getVideosList, + killallServers, + ServerInfo, + setAccessTokensToServers, + uploadVideo, wait } from '../../utils/index' import { follow, getFollowersListPaginationAndSort } from '../../utils/server/follows' -import { getJobsListPaginationAndSort } from '../../utils/server/jobs' +import { getJobsListPaginationAndSort, waitJobs } 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', category: 5, licence: 4, - language: 9, + language: 'ja', nsfw: true, + privacy: VideoPrivacy.PUBLIC, description: 'my super description for server 1', + support: 'my super support text 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, licence: 4, - language: 9, + language: 'ja', nsfw: true, description: 'my super description for server 1', - host: 'localhost:9001', - account: 'root', + support: 'my super support text for server 1', + account: { + name: 'root', + host: 'localhost:9001' + }, isLocal: false, duration: 10, tags: [ 'tag1p1', 'tag2p1' ], @@ -56,8 +82,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) @@ -70,11 +100,11 @@ describe('Test handle downs', function () { await follow(servers[1].url, [ servers[0].url ], servers[1].accessToken) - await wait(5000) + await waitJobs(servers) await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes) - await wait(5000) + await waitJobs(servers) for (const server of servers) { const res = await getVideosList(server.url) @@ -85,12 +115,36 @@ 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(10000) + await waitJobs(servers[0]) + + 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 waitJobs(servers[0]) + // Wait scheduler + await wait(11000) const res = await getFollowersListPaginationAndSort(servers[0].url, 0, 1, 'createdAt') expect(res.body.data).to.be.an('array') @@ -98,21 +152,22 @@ 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[] = [ 'waiting', '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) - await wait(5000) + await waitJobs(servers) const res = await getFollowersListPaginationAndSort(servers[0].url, 0, 1, 'createdAt') expect(res.body.data).to.be.an('array') @@ -120,28 +175,97 @@ 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) + await waitJobs(servers) 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') - expect(videoServer2).not.to.be.undefined + await waitJobs(servers) - await completeVideoCheck(servers[1].url, videoServer2, checkAttributes) + 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 + } }) - after(async function () { - killallServers(servers) + it('Should correctly reply to the comment', async function () { + this.timeout(15000) - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() + await addVideoCommentReply(servers[1].url, servers[1].accessToken, videos[1].uuid, commentIdServer2, 'comment 1-4') + + await waitJobs(servers) + + { + const resComment = await getVideoThreadComments(servers[0].url, videos[1].uuid, threadIdServer1) + + 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 () { + killallServers(servers) + }) })