import * as request from 'supertest'
import { VideoPrivacy } from '../../../../shared/models/videos'
import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
-
import {
- addVideoChannel, checkVideoFilesWereRemoved, completeVideoCheck, createUser, dateIsValid, doubleFollow, flushAndRunMultipleServers,
- flushTests, getVideo,
- getVideoChannelsList, getVideosList, killallServers, rateVideo, removeVideo, ServerInfo, setAccessTokensToServers, testImage,
- updateVideo, uploadVideo, userLogin, viewVideo, wait, webtorrentAdd
-} from '../../utils'
+ addVideoChannel,
+ checkTmpIsEmpty,
+ checkVideoFilesWereRemoved,
+ completeVideoCheck,
+ createUser,
+ dateIsValid,
+ doubleFollow,
+ flushAndRunMultipleServers,
+ flushTests,
+ getLocalVideos,
+ getVideo,
+ getVideoChannelsList,
+ getVideosList,
+ killallServers,
+ rateVideo,
+ removeVideo,
+ ServerInfo,
+ setAccessTokensToServers,
+ testImage,
+ updateVideo,
+ uploadVideo,
+ userLogin,
+ viewVideo,
+ wait,
+ webtorrentAdd
+} from '../../../../shared/utils'
import {
- addVideoCommentReply, addVideoCommentThread, deleteVideoComment, getVideoCommentThreads,
+ addVideoCommentReply,
+ addVideoCommentThread,
+ deleteVideoComment,
+ getVideoCommentThreads,
getVideoThreadComments
-} from '../../utils/videos/video-comments'
+} from '../../../../shared/utils/videos/video-comments'
+import { waitJobs } from '../../../../shared/utils/server/jobs'
const expect = chai.expect
// Get the access tokens
await setAccessTokensToServers(servers)
- const videoChannel = {
- name: 'my channel',
- description: 'super channel'
+ {
+ const videoChannel = {
+ name: 'super_channel_name',
+ displayName: 'my channel',
+ description: 'super channel'
+ }
+ await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel)
+ const channelRes = await getVideoChannelsList(servers[ 0 ].url, 0, 1)
+ videoChannelId = channelRes.body.data[ 0 ].id
}
- await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
- const channelRes = await getVideoChannelsList(servers[0].url, 0, 1)
- videoChannelId = channelRes.body.data[0].id
// Server 1 and server 2 follow each other
await doubleFollow(servers[0], servers[1])
name: 'my super name for server 1',
category: 5,
licence: 4,
- language: 9,
+ language: 'ja',
nsfw: true,
description: 'my super description for server 1',
support: 'my super support text for server 1',
}
await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes)
- await wait(10000)
+ await waitJobs(servers)
// All servers should have this video
+ let publishedAt: string = null
for (const server of servers) {
const isLocal = server.url === 'http://localhost:9001'
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',
support: 'my super support text for server 1',
- host: 'localhost:9001',
- account: 'root',
+ account: {
+ name: 'root',
+ host: 'localhost:9001'
+ },
isLocal,
+ publishedAt,
duration: 10,
tags: [ 'tag1p1', 'tag2p1' ],
privacy: VideoPrivacy.PUBLIC,
commentsEnabled: true,
+ downloadEnabled: true,
channel: {
- name: 'my channel',
+ displayName: 'my channel',
+ name: 'super_channel_name',
description: 'super channel',
isLocal
},
const video = videos[0]
await completeVideoCheck(server.url, video, checkAttributes)
+ publishedAt = video.publishedAt
}
})
name: 'my super name for server 2',
category: 4,
licence: 3,
- language: 11,
+ language: 'de',
nsfw: true,
description: 'my super description for server 2',
support: 'my super support text for server 2',
await uploadVideo(servers[1].url, userAccessToken, videoAttributes)
// Transcoding
- await wait(30000)
+ await waitJobs(servers)
// All servers should have this video
for (const server of servers) {
name: 'my super name for server 2',
category: 4,
licence: 3,
- language: 11,
+ language: 'de',
nsfw: true,
description: 'my super description for server 2',
support: 'my super support text for server 2',
- host: 'localhost:9002',
- account: 'user1',
+ account: {
+ name: 'user1',
+ host: 'localhost:9002'
+ },
isLocal,
commentsEnabled: true,
+ downloadEnabled: true,
duration: 5,
tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ],
privacy: VideoPrivacy.PUBLIC,
channel: {
- name: 'Default user1 channel',
+ displayName: 'Main user1 channel',
+ name: 'user1_channel',
description: 'super channel',
isLocal
},
files: [
{
resolution: 240,
- size: 190000
+ size: 187000
},
{
resolution: 360,
- size: 280000
+ size: 278000
},
{
resolution: 480,
- size: 390000
+ size: 383000
},
{
resolution: 720,
- size: 710000
+ size: 706000
}
],
thumbnailfile: 'thumbnail',
name: 'my super name for server 3',
category: 6,
licence: 5,
- language: 11,
+ language: 'de',
nsfw: true,
description: 'my super description for server 3',
support: 'my super support text for server 3',
name: 'my super name for server 3-2',
category: 7,
licence: 6,
- language: 12,
+ language: 'ko',
nsfw: false,
description: 'my super description for server 3-2',
support: 'my super support text for server 3-2',
}
await uploadVideo(servers[2].url, servers[2].accessToken, videoAttributes2)
- await wait(10000)
+ await waitJobs(servers)
// All servers should have this video
for (const server of servers) {
name: 'my super name for server 3',
category: 6,
licence: 5,
- language: 11,
+ language: 'de',
nsfw: true,
description: 'my super description for server 3',
support: 'my super support text for server 3',
- host: 'localhost:9003',
- account: 'root',
+ account: {
+ name: 'root',
+ host: 'localhost:9003'
+ },
isLocal,
duration: 5,
commentsEnabled: true,
+ downloadEnabled: true,
tags: [ 'tag1p3' ],
privacy: VideoPrivacy.PUBLIC,
channel: {
- name: 'Default root channel',
+ displayName: 'Main root channel',
+ name: 'root_channel',
description: '',
isLocal
},
name: 'my super name for server 3-2',
category: 7,
licence: 6,
- language: 12,
+ language: 'ko',
nsfw: false,
description: 'my super description for server 3-2',
support: 'my super support text for server 3-2',
- host: 'localhost:9003',
- account: 'root',
+ account: {
+ name: 'root',
+ host: 'localhost:9003'
+ },
commentsEnabled: true,
+ downloadEnabled: true,
isLocal,
duration: 5,
tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ],
privacy: VideoPrivacy.PUBLIC,
channel: {
- name: 'Default root channel',
+ displayName: 'Main root channel',
+ name: 'root_channel',
description: '',
isLocal
},
})
})
+ describe('It should list local videos', function () {
+ it('Should list only local videos on server 1', async function () {
+ const { body } = await getLocalVideos(servers[0].url)
+
+ expect(body.total).to.equal(1)
+ expect(body.data).to.be.an('array')
+ expect(body.data.length).to.equal(1)
+ expect(body.data[0].name).to.equal('my super name for server 1')
+ })
+
+ it('Should list only local videos on server 2', async function () {
+ const { body } = await getLocalVideos(servers[1].url)
+
+ expect(body.total).to.equal(1)
+ expect(body.data).to.be.an('array')
+ expect(body.data.length).to.equal(1)
+ expect(body.data[0].name).to.equal('my super name for server 2')
+ })
+
+ it('Should list only local videos on server 3', async function () {
+ const { body } = await getLocalVideos(servers[2].url)
+
+ expect(body.total).to.equal(2)
+ expect(body.data).to.be.an('array')
+ expect(body.data.length).to.equal(2)
+ expect(body.data[0].name).to.equal('my super name for server 3')
+ expect(body.data[1].name).to.equal('my super name for server 3-2')
+ })
+ })
+
describe('Should seed the uploaded video', function () {
it('Should add the file 1 by asking server 3', async function () {
this.timeout(10000)
const res2 = await getVideo(servers[0].url, video.id)
const videoDetails = res2.body
- const file = videoDetails.files.find(f => f.resolution === 360)
+ const file = videoDetails.files.find(f => f.resolution.id === 360)
expect(file).not.to.be.undefined
const torrent = await webtorrentAdd(file.magnetUri)
})
it('Should view multiple videos on owned servers', async function () {
- this.timeout(10000)
+ this.timeout(30000)
const tasks: Promise<any>[] = []
- tasks.push(viewVideo(servers[2].url, localVideosServer3[0]))
- tasks.push(viewVideo(servers[2].url, localVideosServer3[0]))
- tasks.push(viewVideo(servers[2].url, localVideosServer3[0]))
- tasks.push(viewVideo(servers[2].url, localVideosServer3[1]))
+ await viewVideo(servers[2].url, localVideosServer3[0])
+ await viewVideo(servers[2].url, localVideosServer3[0])
+ await viewVideo(servers[2].url, localVideosServer3[0])
+ await viewVideo(servers[2].url, localVideosServer3[1])
await Promise.all(tasks)
+ await waitJobs(servers)
+
+ await viewVideo(servers[2].url, localVideosServer3[0])
+
+ await waitJobs(servers)
+
+ await viewVideo(servers[2].url, localVideosServer3[0])
- await wait(5000)
+ await waitJobs(servers)
+
+ // Wait the repeatable job
+ await wait(6000)
for (const server of servers) {
const res = await getVideosList(server.url)
})
it('Should view multiple videos on each servers', async function () {
- this.timeout(15000)
+ this.timeout(30000)
const tasks: Promise<any>[] = []
tasks.push(viewVideo(servers[0].url, remoteVideosServer1[0]))
await Promise.all(tasks)
- await wait(10000)
+ await waitJobs(servers)
+
+ // Wait the repeatable job
+ await wait(8000)
let baseVideos = null
await wait(200)
await rateVideo(servers[2].url, servers[2].accessToken, remoteVideosServer3[0], 'like')
- await wait(10000)
+ await waitJobs(servers)
let baseVideos = null
for (const server of servers) {
name: 'my super video updated',
category: 10,
licence: 7,
- language: 13,
+ language: 'fr',
nsfw: true,
description: 'my super description updated',
support: 'my super support text updated',
await updateVideo(servers[2].url, servers[2].accessToken, toRemove[0].id, attributes)
- await wait(5000)
+ await waitJobs(servers)
})
it('Should have the video 3 updated on each server', async function () {
name: 'my super video updated',
category: 10,
licence: 7,
- language: 13,
+ language: 'fr',
nsfw: true,
description: 'my super description updated',
support: 'my super support text updated',
- host: 'localhost:9003',
- account: 'root',
+ account: {
+ name: 'root',
+ host: 'localhost:9003'
+ },
isLocal,
duration: 5,
commentsEnabled: true,
+ downloadEnabled: true,
tags: [ 'tag_up_1', 'tag_up_2' ],
privacy: VideoPrivacy.PUBLIC,
channel: {
- name: 'Default root channel',
+ displayName: 'Main root channel',
+ name: 'root_channel',
description: '',
isLocal
},
await removeVideo(servers[2].url, servers[2].accessToken, toRemove[0].id)
await removeVideo(servers[2].url, servers[2].accessToken, toRemove[1].id)
- await wait(5000)
+ await waitJobs(servers)
})
it('Should not have files of videos 3 and 3-2 on each server', async function () {
expect(baseVideo.name).to.equal(video.name)
expect(baseVideo.uuid).to.equal(video.uuid)
- expect(baseVideo.category).to.equal(video.category)
- expect(baseVideo.language).to.equal(video.language)
- expect(baseVideo.licence).to.equal(video.licence)
- expect(baseVideo.category).to.equal(video.category)
+ expect(baseVideo.category.id).to.equal(video.category.id)
+ expect(baseVideo.language.id).to.equal(video.language.id)
+ expect(baseVideo.licence.id).to.equal(video.licence.id)
expect(baseVideo.nsfw).to.equal(video.nsfw)
- expect(baseVideo.accountName).to.equal(video.accountName)
+ expect(baseVideo.account.name).to.equal(video.account.name)
+ expect(baseVideo.account.displayName).to.equal(video.account.displayName)
+ expect(baseVideo.account.url).to.equal(video.account.url)
+ expect(baseVideo.account.host).to.equal(video.account.host)
expect(baseVideo.tags).to.deep.equal(video.tags)
}
})
})
describe('Should comment these videos', function () {
+ let childOfFirstChild: VideoCommentThreadTree
+
it('Should add comment (threads and replies)', async function () {
this.timeout(25000)
await addVideoCommentThread(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, text)
}
- await wait(5000)
+ await waitJobs(servers)
{
const res = await getVideoCommentThreads(servers[1].url, videoUUID, 0, 5)
await addVideoCommentReply(servers[ 1 ].url, servers[ 1 ].accessToken, videoUUID, threadId, text)
}
- await wait(5000)
+ await waitJobs(servers)
{
const res1 = await getVideoCommentThreads(servers[2].url, videoUUID, 0, 5)
await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, childCommentId, text2)
}
- await wait(5000)
+ await waitJobs(servers)
})
it('Should have these threads', async function () {
expect(firstChild.comment.account.host).equal('localhost:9002')
expect(firstChild.children).to.have.lengthOf(1)
- const childOfFirstChild = firstChild.children[0]
+ childOfFirstChild = firstChild.children[0]
expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
expect(childOfFirstChild.comment.account.name).equal('root')
expect(childOfFirstChild.comment.account.host).equal('localhost:9003')
}
})
+ it('Should delete a reply', async function () {
+ this.timeout(10000)
+
+ await deleteVideoComment(servers[2].url, servers[2].accessToken, videoUUID, childOfFirstChild.comment.id)
+
+ await waitJobs(servers)
+ })
+
+ it('Should not have this comment anymore', async function () {
+ for (const server of servers) {
+ const res1 = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+ const threadId = res1.body.data.find(c => c.text === 'my super first comment').id
+
+ const res2 = await getVideoThreadComments(server.url, videoUUID, threadId)
+
+ const tree: VideoCommentThreadTree = res2.body
+ expect(tree.comment.text).equal('my super first comment')
+
+ const firstChild = tree.children[0]
+ expect(firstChild.comment.text).to.equal('my super answer to thread 1')
+ expect(firstChild.children).to.have.lengthOf(0)
+
+ const secondChild = tree.children[1]
+ expect(secondChild.comment.text).to.equal('my second answer to thread 1')
+ }
+ })
+
it('Should delete the thread comments', async function () {
this.timeout(10000)
const threadId = res1.body.data.find(c => c.text === 'my super first comment').id
await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId)
- await wait(5000)
+ await waitJobs(servers)
})
it('Should have the thread comments deleted on other servers too', async function () {
}
})
- it('Should disable comments', async function () {
+ it('Should disable comments and download', async function () {
this.timeout(20000)
const attributes = {
- commentsEnabled: false
+ commentsEnabled: false,
+ downloadEnabled: false
}
await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, attributes)
- await wait(5000)
+ await waitJobs(servers)
for (const server of servers) {
const res = await getVideo(server.url, videoUUID)
expect(res.body.commentsEnabled).to.be.false
+ expect(res.body.downloadEnabled).to.be.false
const text = 'my super forbidden comment'
await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, 409)
describe('With minimum parameters', function () {
it('Should upload and propagate the video', async function () {
- this.timeout(50000)
+ this.timeout(60000)
const path = '/api/v1/videos/upload'
.set('Authorization', 'Bearer ' + servers[1].accessToken)
.field('name', 'minimum parameters')
.field('privacy', '1')
- .field('nsfw', 'false')
.field('channelId', '1')
- .field('commentsEnabled', 'true')
- const filePath = join(__dirname, '..', '..', 'api', 'fixtures', 'video_short.webm')
+ const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm')
await req.attach('videofile', filePath)
.expect(200)
- await wait(25000)
+ await waitJobs(servers)
for (const server of servers) {
const res = await getVideosList(server.url)
nsfw: false,
description: null,
support: null,
- host: 'localhost:9002',
- account: 'root',
+ account: {
+ name: 'root',
+ host: 'localhost:9002'
+ },
isLocal,
duration: 5,
- commentsEnabled: true,
+ commentsEnabled: false,
+ downloadEnabled: false,
tags: [ ],
privacy: VideoPrivacy.PUBLIC,
channel: {
- name: 'Default root channel',
+ displayName: 'Main root channel',
+ name: 'root_channel',
description: '',
isLocal
},
files: [
{
resolution: 720,
- size: 40315
+ size: 72000
},
{
resolution: 480,
- size: 22808
+ size: 45000
},
{
resolution: 360,
- size: 18617
+ size: 34600
},
{
resolution: 240,
- size: 15217
+ size: 24770
}
]
}
})
})
+ describe('TMP directory', function () {
+ it('Should have an empty tmp directory', async function () {
+ for (const server of servers) {
+ await checkTmpIsEmpty(server)
+ }
+ })
+ })
+
after(async function () {
killallServers(servers)
projects / github / Chocobozzz / PeerTube.git / blobdiff