import 'mocha'
import * as chai from 'chai'
import {
- addVideoInPlaylist,
cleanupTests,
- createVideoPlaylist,
- deleteVideoPlaylist,
- flushAndRunMultipleServers,
- getVideoPlaylistsList,
- searchVideoPlaylists,
- ServerInfo,
+ createMultipleServers,
+ PeerTubeServer,
+ SearchCommand,
setAccessTokensToServers,
setDefaultVideoChannel,
- uploadVideoAndGetId,
- wait
-} from '../../../../shared/extra-utils'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { VideoPlaylist, VideoPlaylistPrivacy } from '../../../../shared/models/videos'
+ wait,
+ waitJobs
+} from '@shared/server-commands'
+import { VideoPlaylistPrivacy } from '@shared/models'
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
+ let command: SearchCommand
+
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].search
})
it('Should not find a remote playlist', async function () {
{
- const search = 'http://localhost:' + servers[1].port + '/video-playlists/43'
- const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+ const search = servers[1].url + '/video-playlists/43'
+ const body = await command.searchPlaylists({ search, token: servers[0].accessToken })
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(0)
+ expect(body.total).to.equal(0)
+ expect(body.data).to.be.an('array')
+ expect(body.data).to.have.lengthOf(0)
}
{
// Without token
- const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
- const res = await searchVideoPlaylists(servers[0].url, search)
+ const search = servers[1].url + '/video-playlists/' + playlistServer2UUID
+ const body = await command.searchPlaylists({ search })
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(0)
+ expect(body.total).to.equal(0)
+ expect(body.data).to.be.an('array')
+ expect(body.data).to.have.lengthOf(0)
}
})
it('Should search a local playlist', async function () {
- const search = 'http://localhost:' + servers[0].port + '/video-playlists/' + playlistServer1UUID
- const res = await searchVideoPlaylists(servers[0].url, search)
-
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(1)
- expect(res.body.data[0].displayName).to.equal('playlist 1 on server 1')
- expect(res.body.data[0].videosLength).to.equal(2)
+ const search = servers[0].url + '/video-playlists/' + playlistServer1UUID
+ const body = await command.searchPlaylists({ search })
+
+ expect(body.total).to.equal(1)
+ expect(body.data).to.be.an('array')
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].displayName).to.equal('playlist 1 on server 1')
+ expect(body.data[0].videosLength).to.equal(2)
})
it('Should search a local playlist with an alternative URL', async function () {
const searches = [
- 'http://localhost:' + servers[0].port + '/videos/watch/playlist/' + playlistServer1UUID,
- 'http://localhost:' + servers[0].port + '/w/p/' + playlistServer1UUID
+ servers[0].url + '/videos/watch/playlist/' + playlistServer1UUID,
+ servers[0].url + '/w/p/' + playlistServer1UUID
+ ]
+
+ for (const search of searches) {
+ for (const token of [ undefined, servers[0].accessToken ]) {
+ const body = await command.searchPlaylists({ search, token })
+
+ expect(body.total).to.equal(1)
+ expect(body.data).to.be.an('array')
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].displayName).to.equal('playlist 1 on server 1')
+ expect(body.data[0].videosLength).to.equal(2)
+ }
+ }
+ })
+
+ it('Should search a local playlist with a query in URL', async function () {
+ const searches = [
+ servers[0].url + '/videos/watch/playlist/' + playlistServer1UUID,
+ servers[0].url + '/w/p/' + playlistServer1UUID
]
for (const search of searches) {
for (const token of [ undefined, servers[0].accessToken ]) {
- const res = await searchVideoPlaylists(servers[0].url, search, token)
+ const body = await command.searchPlaylists({ search: search + '?param=1', token })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(1)
- expect(res.body.data[0].displayName).to.equal('playlist 1 on server 1')
- expect(res.body.data[0].videosLength).to.equal(2)
+ expect(body.total).to.equal(1)
+ expect(body.data).to.be.an('array')
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].displayName).to.equal('playlist 1 on server 1')
+ expect(body.data[0].videosLength).to.equal(2)
}
}
})
it('Should search a remote playlist', async function () {
const searches = [
- 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID,
- 'http://localhost:' + servers[1].port + '/videos/watch/playlist/' + playlistServer2UUID,
- 'http://localhost:' + servers[1].port + '/w/p/' + playlistServer2UUID
+ servers[1].url + '/video-playlists/' + playlistServer2UUID,
+ servers[1].url + '/videos/watch/playlist/' + playlistServer2UUID,
+ servers[1].url + '/w/p/' + playlistServer2UUID
]
for (const search of searches) {
- const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+ const body = await command.searchPlaylists({ search, token: servers[0].accessToken })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(1)
- expect(res.body.data[0].displayName).to.equal('playlist 1 on server 2')
- expect(res.body.data[0].videosLength).to.equal(1)
+ expect(body.total).to.equal(1)
+ expect(body.data).to.be.an('array')
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].displayName).to.equal('playlist 1 on server 2')
+ expect(body.data[0].videosLength).to.equal(1)
}
})
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
await wait(10000)
// Will run refresh async
- const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
- await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+ const search = servers[1].url + '/video-playlists/' + playlistServer2UUID
+ await command.searchPlaylists({ search, token: servers[0].accessToken })
// Wait refresh
await wait(5000)
- const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ const body = await command.searchPlaylists({ search, token: servers[0].accessToken })
+ expect(body.total).to.equal(1)
+ expect(body.data).to.have.lengthOf(1)
- const playlist: VideoPlaylist = res.body.data[0]
+ const playlist = body.data[0]
expect(playlist.videosLength).to.equal(2)
})
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
await wait(10000)
// Will run refresh async
- const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
- await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+ const search = servers[1].url + '/video-playlists/' + playlistServer2UUID
+ await command.searchPlaylists({ search, token: servers[0].accessToken })
// Wait refresh
await wait(5000)
- const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.have.lengthOf(0)
+ const body = await command.searchPlaylists({ search, token: servers[0].accessToken })
+ expect(body.total).to.equal(0)
+ expect(body.data).to.have.lengthOf(0)
})
after(async function () {
projects / github / Chocobozzz / PeerTube.git / blobdiff