import 'mocha'
import { Video, VideoPrivacy } from '../../../../shared/models/videos'
import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
-import { completeVideoCheck } from '../../utils'
-
+import { cleanupTests, completeVideoCheck } from '../../../../shared/extra-utils'
+import {
+ flushAndRunMultipleServers,
+ getVideosList,
+ ServerInfo,
+ setAccessTokensToServers,
+ uploadVideo
+} from '../../../../shared/extra-utils/index'
+import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs'
import {
- flushAndRunMultipleServers, flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo,
- wait
-} from '../../utils/index'
-import { dateIsValid } from '../../utils/miscs/miscs'
-import { follow, getFollowersListPaginationAndSort, getFollowingListPaginationAndSort, unfollow } from '../../utils/server/follows'
-import { expectAccountFollows } from '../../utils/users/accounts'
-import { userLogin } from '../../utils/users/login'
-import { createUser } from '../../utils/users/users'
+ 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,
+ addVideoCommentReply,
+ addVideoCommentThread,
+ getVideoCommentThreads,
getVideoThreadComments
-} from '../../utils/videos/video-comments'
-import { rateVideo } from '../../utils/videos/videos'
+} 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'
const expect = chai.expect
let servers: ServerInfo[] = []
before(async function () {
- this.timeout(20000)
+ this.timeout(30000)
servers = await flushAndRunMultipleServers(3)
})
it('Should have server 1 following server 2 and 3', async function () {
- this.timeout(10000)
+ this.timeout(30000)
await follow(servers[0].url, [ servers[1].url, servers[2].url ], servers[0].accessToken)
- await wait(7000)
+ await waitJobs(servers)
})
it('Should have 2 followings on server 1', async function () {
res = await getFollowingListPaginationAndSort(servers[0].url, 1, 1, 'createdAt')
follows = follows.concat(res.body.data)
- const server2Follow = follows.find(f => f.following.host === 'localhost:9002')
- const server3Follow = follows.find(f => f.following.host === 'localhost:9003')
+ const server2Follow = follows.find(f => f.following.host === 'localhost:' + servers[1].port)
+ const server3Follow = follows.find(f => f.following.host === 'localhost:' + servers[2].port)
expect(server2Follow).to.not.be.undefined
expect(server3Follow).to.not.be.undefined
expect(server3Follow.state).to.equal('accepted')
})
- it('Should have 0 followings on server 1 and 2', async function () {
+ it('Should search followings on server 1', async function () {
+ {
+ const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 1, 'createdAt', ':' + servers[1].port)
+ const follows = res.body.data
+
+ expect(res.body.total).to.equal(1)
+ expect(follows.length).to.equal(1)
+ expect(follows[ 0 ].following.host).to.equal('localhost:' + servers[1].port)
+ }
+
+ {
+ const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 1, 'createdAt', 'bla')
+ const follows = res.body.data
+
+ expect(res.body.total).to.equal(0)
+ expect(follows.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(server.url, 0, 5, 'createdAt')
const follows = res.body.data
expect(res.body.total).to.equal(1)
expect(follows).to.be.an('array')
expect(follows.length).to.equal(1)
- expect(follows[0].follower.host).to.equal('localhost:9001')
+ expect(follows[0].follower.host).to.equal('localhost:' + servers[0].port)
+ }
+ })
+
+ it('Should search followers on server 2', async function () {
+ {
+ const res = await getFollowersListPaginationAndSort(servers[ 2 ].url, 0, 5, 'createdAt', servers[0].port + '')
+ const follows = res.body.data
+
+ expect(res.body.total).to.equal(1)
+ expect(follows.length).to.equal(1)
+ expect(follows[ 0 ].following.host).to.equal('localhost:' + servers[2].port)
+ }
+
+ {
+ const res = await getFollowersListPaginationAndSort(servers[ 2 ].url, 0, 5, 'createdAt', 'bla')
+ const follows = res.body.data
+
+ expect(res.body.total).to.equal(0)
+ expect(follows.length).to.equal(0)
}
})
expect(follows.length).to.equal(0)
})
- it('Should have the correct following counts', async function () {
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9001', 0, 2)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9002', 1, 0)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9003', 1, 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)
// Server 2 and 3 does not know server 1 follow another server (there was not a refresh)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:9001', 0, 1)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:9002', 1, 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(servers[2].url, 'peertube@localhost:9001', 0, 1)
- await expectAccountFollows(servers[2].url, 'peertube@localhost:9003', 1, 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)
})
it('Should unfollow server 3 on server 1', async function () {
await unfollow(servers[0].url, servers[0].accessToken, servers[2])
- await wait(3000)
+ await waitJobs(servers)
})
it('Should not follow server 3 on server 1 anymore', async function () {
expect(follows).to.be.an('array')
expect(follows.length).to.equal(1)
- expect(follows[0].following.host).to.equal('localhost:9002')
+ expect(follows[0].following.host).to.equal('localhost:' + servers[1].port)
})
it('Should not have server 1 as follower on server 3 anymore', async function () {
expect(follows.length).to.equal(0)
})
- it('Should have the correct following counts 2', async function () {
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9001', 0, 1)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9002', 1, 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(servers[1].url, 'peertube@localhost:9001', 0, 1)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:9002', 1, 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(servers[2].url, 'peertube@localhost:9001', 0, 0)
- await expectAccountFollows(servers[2].url, 'peertube@localhost:9003', 0, 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)
})
- it('Should upload a video on server 2 ans 3 and propagate only the video of server 2', async function () {
- this.timeout(10000)
+ it('Should upload a video on server 2 and 3 and propagate only the video of server 2', async function () {
+ this.timeout(35000)
await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'server2' })
await uploadVideo(servers[2].url, servers[2].accessToken, { name: 'server3' })
- await wait(5000)
+ await waitJobs(servers)
let res = await getVideosList(servers[0].url)
expect(res.body.total).to.equal(1)
expect(res.body.data[0].name).to.equal('server3')
})
- describe('Should propagate data on a new following', async function () {
+ describe('Should propagate data on a new following', function () {
let video4: Video
before(async function () {
{
const user = { username: 'captain', password: 'password' }
- await createUser(servers[ 2 ].url, servers[ 2 ].accessToken, user.username, user.password)
+ await createUser({ url: servers[ 2 ].url, accessToken: servers[ 2 ].accessToken, username: user.username, password: user.password })
const userAccessToken = await userLogin(servers[ 2 ], user)
const resVideos = await getVideosList(servers[ 2 ].url)
const text3 = 'my second answer to thread 1'
await addVideoCommentReply(servers[ 2 ].url, servers[ 2 ].accessToken, video4.id, threadId, text3)
}
+
+ {
+ await createVideoCaption({
+ url: servers[2].url,
+ accessToken: servers[2].accessToken,
+ language: 'ar',
+ videoId: video4.id,
+ fixture: 'subtitle-good2.vtt'
+ })
+ }
}
- await wait(5000)
+ await waitJobs(servers)
// Server 1 follows server 3
await follow(servers[ 0 ].url, [ servers[ 2 ].url ], servers[ 0 ].accessToken)
- await wait(7000)
+ await waitJobs(servers)
})
- it('Should have the correct following counts 2', async function () {
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9001', 0, 2)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9002', 1, 0)
- await expectAccountFollows(servers[0].url, 'peertube@localhost:9003', 1, 0)
+ 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(servers[1].url, 'peertube@localhost:9001', 0, 1)
- await expectAccountFollows(servers[1].url, 'peertube@localhost:9002', 1, 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(servers[2].url, 'peertube@localhost:9001', 0, 1)
- await expectAccountFollows(servers[2].url, 'peertube@localhost:9003', 1, 0)
+ await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[0].port, 0, 2)
+ await expectAccountFollows(servers[2].url, 'peertube@localhost:' + servers[2].port, 1, 0)
})
- it('Should propagate videos', async function () {
+ it('Should have propagated videos', async function () {
const res = await getVideosList(servers[ 0 ].url)
expect(res.body.total).to.equal(7)
name: 'server3-4',
category: 2,
licence: 6,
- language: 3,
+ language: 'zh',
nsfw: true,
description: 'my super description',
- host: 'localhost:9003',
- account: 'root',
+ support: 'my super support text',
+ account: {
+ name: 'root',
+ host: 'localhost:' + servers[2].port
+ },
isLocal,
commentsEnabled: true,
+ downloadEnabled: true,
duration: 5,
tags: [ 'tag1', 'tag2', 'tag3' ],
privacy: VideoPrivacy.PUBLIC,
likes: 1,
dislikes: 1,
channel: {
- name: 'Default root channel',
+ displayName: 'Main root channel',
+ name: 'root_channel',
description: '',
isLocal
},
await completeVideoCheck(servers[ 0 ].url, video4, checkAttributes)
})
- it('Should propagate comments', async function () {
+ it('Should have propagated comments', async function () {
const res1 = await getVideoCommentThreads(servers[0].url, video4.id, 0, 5)
expect(res1.body.total).to.equal(1)
expect(comment.videoId).to.equal(video4.id)
expect(comment.id).to.equal(comment.threadId)
expect(comment.account.name).to.equal('root')
- expect(comment.account.host).to.equal('localhost:9003')
+ expect(comment.account.host).to.equal('localhost:' + servers[2].port)
expect(comment.totalReplies).to.equal(3)
expect(dateIsValid(comment.createdAt as string)).to.be.true
expect(dateIsValid(comment.updatedAt as string)).to.be.true
expect(secondChild.comment.text).to.equal('my second answer to thread 1')
expect(secondChild.children).to.have.lengthOf(0)
})
+
+ 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 caption1: VideoCaption = res.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')
+ 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 waitJobs(servers)
+
+ let res = await getVideosList(servers[ 0 ].url)
+ expect(res.body.total).to.equal(1)
+ })
+
})
after(async function () {
- killallServers(servers)
-
- // Keep the logs if the test failed
- if (this['ok']) {
- await flushTests()
- }
+ await cleanupTests(servers)
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff