/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
import 'mocha'
-import { Video, VideoPrivacy } from '../../../../shared/models/videos'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
-import { cleanupTests, completeVideoCheck, deleteVideoComment } from '../../../../shared/extra-utils'
+import * as chai from 'chai'
import {
+ cleanupTests,
+ completeVideoCheck,
+ createUser,
+ dateIsValid,
+ expectAccountFollows,
flushAndRunMultipleServers,
+ FollowsCommand,
getVideosList,
+ rateVideo,
ServerInfo,
setAccessTokensToServers,
- uploadVideo
-} from '../../../../shared/extra-utils/index'
-import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs'
-import {
- follow,
- getFollowersListPaginationAndSort,
- getFollowingListPaginationAndSort,
- unfollow
-} from '../../../../shared/extra-utils/server/follows'
-import { expectAccountFollows } from '../../../../shared/extra-utils/users/accounts'
-import { userLogin } from '../../../../shared/extra-utils/users/login'
-import { createUser } from '../../../../shared/extra-utils/users/users'
-import {
- addVideoCommentReply,
- addVideoCommentThread,
- getVideoCommentThreads,
- getVideoThreadComments
-} from '../../../../shared/extra-utils/videos/video-comments'
-import { rateVideo } from '../../../../shared/extra-utils/videos/videos'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/extra-utils/videos/video-captions'
-import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
+ testCaptionFile,
+ uploadVideo,
+ userLogin,
+ waitJobs
+} from '@shared/extra-utils'
+import { Video, VideoPrivacy } from '@shared/models'
const expect = chai.expect
describe('Test follows', function () {
let servers: ServerInfo[] = []
+ let followsCommands: FollowsCommand[]
before(async function () {
this.timeout(30000)
servers = await flushAndRunMultipleServers(3)
+ followsCommands = servers.map(s => s.followsCommand)
// Get the access tokens
await setAccessTokensToServers(servers)
it('Should not have followers', async function () {
for (const server of servers) {
- const res = await getFollowersListPaginationAndSort({ url: server.url, start: 0, count: 5, sort: 'createdAt' })
- const follows = res.body.data
+ const body = await server.followsCommand.getFollowers({ start: 0, count: 5, sort: 'createdAt' })
+ expect(body.total).to.equal(0)
- expect(res.body.total).to.equal(0)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(0)
}
it('Should not have following', async function () {
for (const server of servers) {
- const res = await getFollowingListPaginationAndSort({ url: server.url, start: 0, count: 5, sort: 'createdAt' })
- const follows = res.body.data
+ const body = await server.followsCommand.getFollowings({ start: 0, count: 5, sort: 'createdAt' })
+ expect(body.total).to.equal(0)
- expect(res.body.total).to.equal(0)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(0)
}
it('Should have server 1 following server 2 and 3', async function () {
this.timeout(30000)
- await follow(servers[0].url, [ servers[1].url, servers[2].url ], servers[0].accessToken)
+ await followsCommands[0].follow({ targets: [ servers[1].url, servers[2].url ] })
await waitJobs(servers)
})
it('Should have 2 followings on server 1', async function () {
- let res = await getFollowingListPaginationAndSort({ url: servers[0].url, start: 0, count: 1, sort: 'createdAt' })
- let follows = res.body.data
+ const body = await followsCommands[0].getFollowings({ start: 0, count: 1, sort: 'createdAt' })
+ expect(body.total).to.equal(2)
- expect(res.body.total).to.equal(2)
+ let follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(1)
- res = await getFollowingListPaginationAndSort({ url: servers[0].url, start: 1, count: 1, sort: 'createdAt' })
- follows = follows.concat(res.body.data)
+ const body2 = await followsCommands[0].getFollowings({ start: 1, count: 1, sort: 'createdAt' })
+ follows = follows.concat(body2.data)
const server2Follow = follows.find(f => f.following.host === 'localhost:' + servers[1].port)
const server3Follow = follows.find(f => f.following.host === 'localhost:' + servers[2].port)
const sort = 'createdAt'
const start = 0
const count = 1
- const url = servers[0].url
{
const search = ':' + servers[1].port
{
- const res = await getFollowingListPaginationAndSort({ url, start, count, sort, search })
- const follows = res.body.data
+ const body = await followsCommands[0].getFollowings({ start, count, sort, search })
+ expect(body.total).to.equal(1)
- expect(res.body.total).to.equal(1)
+ const follows = body.data
expect(follows.length).to.equal(1)
expect(follows[0].following.host).to.equal('localhost:' + servers[1].port)
}
{
- const res = await getFollowingListPaginationAndSort({ url, start, count, sort, search, state: 'accepted' })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ const body = await followsCommands[0].getFollowings({ start, count, sort, search, state: 'accepted' })
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
}
{
- const res = await getFollowingListPaginationAndSort({ url, start, count, sort, search, state: 'accepted', actorType: 'Person' })
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.have.lengthOf(0)
+ const body = await followsCommands[0].getFollowings({ start, count, sort, search, state: 'accepted', actorType: 'Person' })
+ expect(body.total).to.equal(0)
+ expect(body.data).to.have.lengthOf(0)
}
{
- const res = await getFollowingListPaginationAndSort({
- url,
+ const body = await followsCommands[0].getFollowings({
start,
count,
sort,
state: 'accepted',
actorType: 'Application'
})
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
}
{
- const res = await getFollowingListPaginationAndSort({ url, start, count, sort, search, state: 'pending' })
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.have.lengthOf(0)
+ const body = await followsCommands[0].getFollowings({ start, count, sort, search, state: 'pending' })
+ expect(body.total).to.equal(0)
+ expect(body.data).to.have.lengthOf(0)
}
}
{
- const res = await getFollowingListPaginationAndSort({ url, start, count, sort, search: 'bla' })
- const follows = res.body.data
+ const body = await followsCommands[0].getFollowings({ start, count, sort, search: 'bla' })
+ expect(body.total).to.equal(0)
- expect(res.body.total).to.equal(0)
- expect(follows.length).to.equal(0)
+ expect(body.data.length).to.equal(0)
}
})
it('Should have 0 followings on server 2 and 3', async function () {
for (const server of [ servers[1], servers[2] ]) {
- const res = await getFollowingListPaginationAndSort({ url: server.url, start: 0, count: 5, sort: 'createdAt' })
- const follows = res.body.data
+ const body = await server.followsCommand.getFollowings({ start: 0, count: 5, sort: 'createdAt' })
+ expect(body.total).to.equal(0)
- expect(res.body.total).to.equal(0)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(0)
}
it('Should have 1 followers on server 2 and 3', async function () {
for (const server of [ servers[1], servers[2] ]) {
- const res = await getFollowersListPaginationAndSort({ url: server.url, start: 0, count: 1, sort: 'createdAt' })
+ const body = await server.followsCommand.getFollowers({ start: 0, count: 1, sort: 'createdAt' })
+ expect(body.total).to.equal(1)
- const follows = res.body.data
- expect(res.body.total).to.equal(1)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(1)
expect(follows[0].follower.host).to.equal('localhost:' + servers[0].port)
})
it('Should search/filter followers on server 2', async function () {
- const url = servers[2].url
const start = 0
const count = 5
const sort = 'createdAt'
const search = servers[0].port + ''
{
- const res = await getFollowersListPaginationAndSort({ url, start, count, sort, search })
- const follows = res.body.data
+ const body = await followsCommands[2].getFollowers({ start, count, sort, search })
+ expect(body.total).to.equal(1)
- expect(res.body.total).to.equal(1)
+ const follows = body.data
expect(follows.length).to.equal(1)
expect(follows[0].following.host).to.equal('localhost:' + servers[2].port)
}
{
- const res = await getFollowersListPaginationAndSort({ url, start, count, sort, search, state: 'accepted' })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ const body = await followsCommands[2].getFollowers({ start, count, sort, search, state: 'accepted' })
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
}
{
- const res = await getFollowersListPaginationAndSort({ url, start, count, sort, search, state: 'accepted', actorType: 'Person' })
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.have.lengthOf(0)
+ const body = await followsCommands[2].getFollowers({ start, count, sort, search, state: 'accepted', actorType: 'Person' })
+ expect(body.total).to.equal(0)
+ expect(body.data).to.have.lengthOf(0)
}
{
- const res = await getFollowersListPaginationAndSort({
- url,
+ const body = await followsCommands[2].getFollowers({
start,
count,
sort,
state: 'accepted',
actorType: 'Application'
})
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
}
{
- const res = await getFollowersListPaginationAndSort({ url, start, count, sort, search, state: 'pending' })
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.have.lengthOf(0)
+ const body = await followsCommands[2].getFollowers({ start, count, sort, search, state: 'pending' })
+ expect(body.total).to.equal(0)
+ expect(body.data).to.have.lengthOf(0)
}
}
{
- const res = await getFollowersListPaginationAndSort({ url, start, count, sort, search: 'bla' })
- const follows = res.body.data
+ const body = await followsCommands[2].getFollowers({ start, count, sort, search: 'bla' })
+ expect(body.total).to.equal(0)
- expect(res.body.total).to.equal(0)
+ const follows = body.data
expect(follows.length).to.equal(0)
}
})
it('Should have 0 followers on server 1', async function () {
- const res = await getFollowersListPaginationAndSort({ url: servers[0].url, start: 0, count: 5, sort: 'createdAt' })
- const follows = res.body.data
+ const body = await followsCommands[0].getFollowers({ start: 0, count: 5, sort: 'createdAt' })
+ expect(body.total).to.equal(0)
- expect(res.body.total).to.equal(0)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(0)
})
it('Should have the correct follows counts', async function () {
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[0].port, 0, 2)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[1].port, 1, 0)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[2].port, 1, 0)
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 2 })
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[1].port, followers: 1, following: 0 })
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[2].port, followers: 1, following: 0 })
// Server 2 and 3 does not know server 1 follow another server (there was not a refresh)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:' + servers[0].port, 0, 1)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:' + servers[1].port, 1, 0)
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@localhost:' + servers[1].port, followers: 1, following: 0 })
- await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[0].port, 0, 1)
- await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[2].port, 1, 0)
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@localhost:' + servers[2].port, followers: 1, following: 0 })
})
it('Should unfollow server 3 on server 1', async function () {
this.timeout(5000)
- await unfollow(servers[0].url, servers[0].accessToken, servers[2])
+ await followsCommands[0].unfollow({ target: servers[2] })
await waitJobs(servers)
})
it('Should not follow server 3 on server 1 anymore', async function () {
- const res = await getFollowingListPaginationAndSort({ url: servers[0].url, start: 0, count: 2, sort: 'createdAt' })
- const follows = res.body.data
+ const body = await followsCommands[0].getFollowings({ start: 0, count: 2, sort: 'createdAt' })
+ expect(body.total).to.equal(1)
- expect(res.body.total).to.equal(1)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(1)
})
it('Should not have server 1 as follower on server 3 anymore', async function () {
- const res = await getFollowersListPaginationAndSort({ url: servers[2].url, start: 0, count: 1, sort: 'createdAt' })
+ const body = await followsCommands[2].getFollowers({ start: 0, count: 1, sort: 'createdAt' })
+ expect(body.total).to.equal(0)
- const follows = res.body.data
- expect(res.body.total).to.equal(0)
+ const follows = body.data
expect(follows).to.be.an('array')
expect(follows.length).to.equal(0)
})
it('Should have the correct follows counts 2', async function () {
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[0].port, 0, 1)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[1].port, 1, 0)
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[1].port, followers: 1, following: 0 })
- await expectAccountFollows(servers[1].url, 'peertube@localhost:' + servers[0].port, 0, 1)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:' + servers[1].port, 1, 0)
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@localhost:' + servers[1].port, followers: 1, following: 0 })
- await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[0].port, 0, 0)
- await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[2].port, 0, 0)
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 0 })
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@localhost:' + servers[2].port, followers: 0, following: 0 })
})
it('Should upload a video on server 2 and 3 and propagate only the video of server 2', async function () {
- this.timeout(35000)
+ this.timeout(60000)
await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'server2' })
await uploadVideo(servers[2].url, servers[2].accessToken, { name: 'server3' })
{
{
const text = 'my super first comment'
- const res = await addVideoCommentThread(servers[2].url, servers[2].accessToken, video4.id, text)
- const threadId = res.body.comment.id
+ const created = await servers[2].commentsCommand.createThread({ videoId: video4.id, text })
+ const threadId = created.id
const text1 = 'my super answer to thread 1'
- const childCommentRes = await addVideoCommentReply(servers[2].url, servers[2].accessToken, video4.id, threadId, text1)
- const childCommentId = childCommentRes.body.comment.id
+ const childComment = await servers[2].commentsCommand.addReply({ videoId: video4.id, toCommentId: threadId, text: text1 })
const text2 = 'my super answer to answer of thread 1'
- await addVideoCommentReply(servers[2].url, servers[2].accessToken, video4.id, childCommentId, text2)
+ await servers[2].commentsCommand.addReply({ videoId: video4.id, toCommentId: childComment.id, text: text2 })
const text3 = 'my second answer to thread 1'
- await addVideoCommentReply(servers[2].url, servers[2].accessToken, video4.id, threadId, text3)
+ await servers[2].commentsCommand.addReply({ videoId: video4.id, toCommentId: threadId, text: text3 })
}
{
const text = 'will be deleted'
- const res = await addVideoCommentThread(servers[2].url, servers[2].accessToken, video4.id, text)
- const threadId = res.body.comment.id
+ const created = await servers[2].commentsCommand.createThread({ videoId: video4.id, text })
+ const threadId = created.id
const text1 = 'answer to deleted'
- await addVideoCommentReply(servers[2].url, servers[2].accessToken, video4.id, threadId, text1)
+ await servers[2].commentsCommand.addReply({ videoId: video4.id, toCommentId: threadId, text: text1 })
const text2 = 'will also be deleted'
- const childCommentRes = await addVideoCommentReply(servers[2].url, servers[2].accessToken, video4.id, threadId, text2)
- const childCommentId = childCommentRes.body.comment.id
+ const childComment = await servers[2].commentsCommand.addReply({ videoId: video4.id, toCommentId: threadId, text: text2 })
const text3 = 'my second answer to deleted'
- await addVideoCommentReply(servers[2].url, servers[2].accessToken, video4.id, childCommentId, text3)
+ await servers[2].commentsCommand.addReply({ videoId: video4.id, toCommentId: childComment.id, text: text3 })
- await deleteVideoComment(servers[2].url, servers[2].accessToken, video4.id, threadId)
- await deleteVideoComment(servers[2].url, servers[2].accessToken, video4.id, childCommentId)
+ await servers[2].commentsCommand.delete({ videoId: video4.id, commentId: threadId })
+ await servers[2].commentsCommand.delete({ videoId: video4.id, commentId: childComment.id })
}
}
{
- await createVideoCaption({
- url: servers[2].url,
- accessToken: servers[2].accessToken,
+ await servers[2].captionsCommand.createVideoCaption({
language: 'ar',
videoId: video4.id,
fixture: 'subtitle-good2.vtt'
await waitJobs(servers)
// Server 1 follows server 3
- await follow(servers[0].url, [ servers[2].url ], servers[0].accessToken)
+ await followsCommands[0].follow({ targets: [ servers[2].url ] })
await waitJobs(servers)
})
it('Should have the correct follows counts 3', async function () {
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[0].port, 0, 2)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[1].port, 1, 0)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:' + servers[2].port, 1, 0)
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 2 })
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[1].port, followers: 1, following: 0 })
+ await expectAccountFollows({ server: servers[0], handle: 'peertube@localhost:' + servers[2].port, followers: 1, following: 0 })
- await expectAccountFollows(servers[1].url, 'peertube@localhost:' + servers[0].port, 0, 1)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:' + servers[1].port, 1, 0)
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@localhost:' + servers[1].port, followers: 1, following: 0 })
- await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[0].port, 0, 1)
- await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[2].port, 1, 0)
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@localhost:' + servers[0].port, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@localhost:' + servers[2].port, followers: 1, following: 0 })
})
it('Should have propagated videos', async function () {
})
it('Should have propagated comments', async function () {
- const res1 = await getVideoCommentThreads(servers[0].url, video4.id, 0, 5, 'createdAt')
+ const { total, data } = await servers[0].commentsCommand.listThreads({ videoId: video4.id, sort: 'createdAt' })
- expect(res1.body.total).to.equal(2)
- expect(res1.body.data).to.be.an('array')
- expect(res1.body.data).to.have.lengthOf(2)
+ expect(total).to.equal(2)
+ expect(data).to.be.an('array')
+ expect(data).to.have.lengthOf(2)
{
- const comment: VideoComment = res1.body.data[0]
+ const comment = data[0]
expect(comment.inReplyToCommentId).to.be.null
expect(comment.text).equal('my super first comment')
expect(comment.videoId).to.equal(video4.id)
const threadId = comment.threadId
- const res2 = await getVideoThreadComments(servers[0].url, video4.id, threadId)
-
- const tree: VideoCommentThreadTree = res2.body
+ const tree = await servers[0].commentsCommand.getThread({ videoId: video4.id, threadId })
expect(tree.comment.text).equal('my super first comment')
expect(tree.children).to.have.lengthOf(2)
}
{
- const deletedComment: VideoComment = res1.body.data[1]
+ const deletedComment = 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(deletedComment.totalReplies).to.equal(2)
expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
- const res2 = await getVideoThreadComments(servers[0].url, video4.id, deletedComment.threadId)
-
- const tree: VideoCommentThreadTree = res2.body
+ const tree = await servers[0].commentsCommand.getThread({ videoId: video4.id, threadId: deletedComment.threadId })
const [ commentRoot, deletedChildRoot ] = tree.children
expect(deletedChildRoot).to.not.be.undefined
})
it('Should have propagated captions', async function () {
- const res = await listVideoCaptions(servers[0].url, video4.id)
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ const body = await servers[0].captionsCommand.listVideoCaptions({ videoId: video4.id })
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
- const caption1: VideoCaption = res.body.data[0]
+ const caption1 = body.data[0]
expect(caption1.language.id).to.equal('ar')
expect(caption1.language.label).to.equal('Arabic')
- expect(caption1.captionPath).to.equal('/static/video-captions/' + video4.uuid + '-ar.vtt')
+ expect(caption1.captionPath).to.match(new RegExp('^/lazy-static/video-captions/.+-ar.vtt$'))
await testCaptionFile(servers[0].url, caption1.captionPath, 'Subtitle good 2.')
})
it('Should unfollow server 3 on server 1 and does not list server 3 videos', async function () {
this.timeout(5000)
- await unfollow(servers[0].url, servers[0].accessToken, servers[2])
+ await followsCommands[0].unfollow({ target: servers[2] })
await waitJobs(servers)
projects / github / Chocobozzz / PeerTube.git / blobdiff