-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
import 'mocha'
-import { join } from 'path'
+import * as chai from 'chai'
import * as request from 'supertest'
-import { VideoPrivacy } from '../../../../shared/models/videos'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import {
addVideoChannel,
+ buildAbsoluteFixturePath,
checkTmpIsEmpty,
checkVideoFilesWereRemoved,
cleanupTests,
createUser,
dateIsValid,
doubleFollow,
- flushAndRunServer,
flushAndRunMultipleServers,
getLocalVideos,
getVideo,
wait,
webtorrentAdd
} from '../../../../shared/extra-utils'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
import {
addVideoCommentReply,
addVideoCommentThread,
deleteVideoComment,
+ findCommentId,
getVideoCommentThreads,
getVideoThreadComments
} from '../../../../shared/extra-utils/videos/video-comments'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { VideoComment, VideoCommentThreadTree, VideoPrivacy } from '../../../../shared/models/videos'
const expect = chai.expect
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
})
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',
password: 'super_password'
}
- await createUser({ url: servers[ 1 ].url, accessToken: servers[ 1 ].accessToken, username: user.username, password: user.password })
+ await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
const userAccessToken = await userLogin(servers[1], user)
const videoAttributes = {
thumbnailfile: 'thumbnail.jpg',
previewfile: 'preview.jpg'
}
- await uploadVideo(servers[1].url, userAccessToken, videoAttributes)
+ await uploadVideo(servers[1].url, userAccessToken, videoAttributes, HttpStatusCode.OK_200, 'resumable')
// Transcoding
await waitJobs(servers)
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',
// Wait the repeatable job
await wait(6000)
+ await waitJobs(servers)
+
for (const server of servers) {
const res = await getVideosList(server.url)
// Wait the repeatable job
await wait(16000)
+ await waitJobs(servers)
+
let baseVideos = null
for (const server of servers) {
})
it('Should like and dislikes videos on different services', async function () {
- this.timeout(20000)
+ this.timeout(50000)
await rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like')
await wait(500)
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) {
it('Should not have files of videos 3 and 3-2 on each server', async function () {
for (const server of servers) {
- await checkVideoFilesWereRemoved(toRemove[0].uuid, server.serverNumber)
- await checkVideoFilesWereRemoved(toRemove[1].uuid, server.serverNumber)
+ await checkVideoFilesWereRemoved(toRemove[0].uuid, server.internalServerNumber)
+ await checkVideoFilesWereRemoved(toRemove[1].uuid, server.internalServerNumber)
}
})
{
const text = 'my super first comment'
- await addVideoCommentThread(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, text)
+ await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, text)
}
{
const text = 'my super second comment'
- await addVideoCommentThread(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, text)
+ await addVideoCommentThread(servers[2].url, servers[2].accessToken, videoUUID, text)
}
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)
+ await addVideoCommentReply(servers[1].url, servers[1].accessToken, videoUUID, threadId, text)
}
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
const text3 = 'my second answer to thread 1'
- await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, threadId, text3)
+ await addVideoCommentReply(servers[2].url, servers[2].accessToken, videoUUID, threadId, text3)
const text2 = 'my super answer to answer of thread 1'
- await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, videoUUID, childCommentId, text2)
+ await addVideoCommentReply(servers[2].url, servers[2].accessToken, videoUUID, childCommentId, text2)
}
await waitJobs(servers)
it('Should delete the thread comments', async function () {
this.timeout(10000)
- const res = await getVideoCommentThreads(servers[ 0 ].url, videoUUID, 0, 5)
+ const res = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5)
const threadId = res.body.data.find(c => c.text === 'my super first comment').id
- await deleteVideoComment(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, threadId)
+ await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId)
await waitJobs(servers)
})
expect(deletedComment.text).to.equal('')
expect(deletedComment.inReplyToCommentId).to.be.null
expect(deletedComment.account).to.be.null
- expect(deletedComment.totalReplies).to.equal(3)
+ expect(deletedComment.totalReplies).to.equal(2)
expect(dateIsValid(deletedComment.createdAt as string)).to.be.true
expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true
expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
}
})
- it('Should retrieve all comments when subscribing to a new server', async function () {
- this.timeout(120000)
-
- const newServer = await flushAndRunServer(4)
-
- await setAccessTokensToServers([newServer])
- await doubleFollow(newServer, servers[0])
- await doubleFollow(newServer, servers[2])
- await waitJobs([newServer, ...servers])
-
- const res = await getVideoCommentThreads(newServer.url, videoUUID, 0, 5)
-
- expect(res.body.total).to.equal(2)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(2)
-
- {
- const comment: VideoComment = res.body.data[0]
- expect(comment).to.not.be.undefined
- expect(comment.inReplyToCommentId).to.be.null
- expect(comment.account.name).to.equal('root')
- expect(comment.account.host).to.equal('localhost:' + servers[2].port)
- expect(comment.totalReplies).to.equal(0)
- expect(dateIsValid(comment.createdAt as string)).to.be.true
- expect(dateIsValid(comment.updatedAt as string)).to.be.true
- }
-
- {
- const deletedComment: VideoComment = res.body.data[1]
- expect(deletedComment).to.not.be.undefined
- expect(deletedComment.isDeleted).to.be.true
- expect(deletedComment.deletedAt).to.not.be.null
- expect(deletedComment.text).to.equal('')
- expect(deletedComment.inReplyToCommentId).to.be.null
- expect(deletedComment.account).to.be.null
- expect(deletedComment.totalReplies).to.equal(3)
- expect(dateIsValid(deletedComment.createdAt as string)).to.be.true
- expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true
- expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
- }
- })
-
it('Should delete a remote thread by the origin server', async function () {
this.timeout(5000)
- const res = await getVideoCommentThreads(servers[ 0 ].url, videoUUID, 0, 5)
+ const res = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5)
const threadId = res.body.data.find(c => c.text === 'my super second comment').id
- await deleteVideoComment(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, threadId)
+ await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId)
await waitJobs(servers)
})
expect(comment.createdAt).to.not.be.null
expect(comment.deletedAt).to.not.be.null
expect(comment.account).to.be.null
- expect(comment.totalReplies).to.equal(3)
+ expect(comment.totalReplies).to.equal(2)
}
}
})
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)
}
})
})
.field('privacy', '1')
.field('channelId', '1')
- const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm')
-
- await req.attach('videofile', filePath)
- .expect(200)
+ await req.attach('videofile', buildAbsoluteFixturePath('video_short.webm'))
+ .expect(HttpStatusCode.OK_200)
await waitJobs(servers)
duration: 5,
commentsEnabled: true,
downloadEnabled: true,
- tags: [ ],
+ tags: [],
privacy: VideoPrivacy.PUBLIC,
channel: {
displayName: 'Main root channel',
files: [
{
resolution: 720,
- size: 72000
+ size: 59000
},
{
resolution: 480,
- size: 45000
+ size: 34000
},
{
resolution: 360,
- size: 34600
+ size: 31000
},
{
resolution: 240,
- size: 24770
+ size: 23000
}
]
}
projects / github / Chocobozzz / PeerTube.git / blobdiff