import 'mocha'
import * as chai from 'chai'
import {
- addVideoInPlaylist,
cleanupTests,
- createVideoPlaylist,
- deleteVideoPlaylist,
- flushAndRunMultipleServers,
- getVideoPlaylistsList,
+ createMultipleServers,
+ PeerTubeServer,
SearchCommand,
- ServerInfo,
setAccessTokensToServers,
setDefaultVideoChannel,
- uploadVideoAndGetId,
wait,
waitJobs
} from '@shared/extra-utils'
const expect = chai.expect
describe('Test ActivityPub playlists search', function () {
- let servers: ServerInfo[]
+ let servers: PeerTubeServer[]
let playlistServer1UUID: string
let playlistServer2UUID: string
let video2Server2: string
before(async function () {
this.timeout(120000)
- servers = await flushAndRunMultipleServers(2)
+ servers = await createMultipleServers(2)
await setAccessTokensToServers(servers)
await setDefaultVideoChannel(servers)
{
- const video1 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 1' })).uuid
- const video2 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 2' })).uuid
+ const video1 = (await servers[0].videos.quickUpload({ name: 'video 1' })).uuid
+ const video2 = (await servers[0].videos.quickUpload({ name: 'video 2' })).uuid
const attributes = {
displayName: 'playlist 1 on server 1',
privacy: VideoPlaylistPrivacy.PUBLIC,
- videoChannelId: servers[0].videoChannel.id
+ videoChannelId: servers[0].store.channel.id
}
- const res = await createVideoPlaylist({ url: servers[0].url, token: servers[0].accessToken, playlistAttrs: attributes })
- playlistServer1UUID = res.body.videoPlaylist.uuid
+ const created = await servers[0].playlists.create({ attributes })
+ playlistServer1UUID = created.uuid
for (const videoId of [ video1, video2 ]) {
- await addVideoInPlaylist({
- url: servers[0].url,
- token: servers[0].accessToken,
- playlistId: playlistServer1UUID,
- elementAttrs: { videoId }
- })
+ await servers[0].playlists.addElement({ playlistId: playlistServer1UUID, attributes: { videoId } })
}
}
{
- const videoId = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 1' })).uuid
- video2Server2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 2' })).uuid
+ const videoId = (await servers[1].videos.quickUpload({ name: 'video 1' })).uuid
+ video2Server2 = (await servers[1].videos.quickUpload({ name: 'video 2' })).uuid
const attributes = {
displayName: 'playlist 1 on server 2',
privacy: VideoPlaylistPrivacy.PUBLIC,
- videoChannelId: servers[1].videoChannel.id
+ videoChannelId: servers[1].store.channel.id
}
- const res = await createVideoPlaylist({ url: servers[1].url, token: servers[1].accessToken, playlistAttrs: attributes })
- playlistServer2UUID = res.body.videoPlaylist.uuid
-
- await addVideoInPlaylist({
- url: servers[1].url,
- token: servers[1].accessToken,
- playlistId: playlistServer2UUID,
- elementAttrs: { videoId }
- })
+ const created = await servers[1].playlists.create({ attributes })
+ playlistServer2UUID = created.uuid
+
+ await servers[1].playlists.addElement({ playlistId: playlistServer2UUID, attributes: { videoId } })
}
await waitJobs(servers)
- command = servers[0].searchCommand
+ command = servers[0].search
})
it('Should not find a remote playlist', async function () {
})
it('Should not list this remote playlist', async function () {
- const res = await getVideoPlaylistsList(servers[0].url, 0, 10)
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
- expect(res.body.data[0].displayName).to.equal('playlist 1 on server 1')
+ const body = await servers[0].playlists.list({ start: 0, count: 10 })
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].displayName).to.equal('playlist 1 on server 1')
})
it('Should update the playlist of server 2, and refresh it on server 1', async function () {
this.timeout(60000)
- await addVideoInPlaylist({
- url: servers[1].url,
- token: servers[1].accessToken,
- playlistId: playlistServer2UUID,
- elementAttrs: { videoId: video2Server2 }
- })
+ await servers[1].playlists.addElement({ playlistId: playlistServer2UUID, attributes: { videoId: video2Server2 } })
await waitJobs(servers)
// Expire playlist
it('Should delete playlist of server 2, and delete it on server 1', async function () {
this.timeout(60000)
- await deleteVideoPlaylist(servers[1].url, servers[1].accessToken, playlistServer2UUID)
+ await servers[1].playlists.delete({ playlistId: playlistServer2UUID })
await waitJobs(servers)
// Expiration