X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsearch%2Fsearch-activitypub-video-channels.ts;h=83be9cd1eb7d00117c7fc519b378ab3de629f55c;hb=a54618880c394ad7571f3f3222dc96ec2dd10d9a;hp=a411e973bdc1bca4058860a1796e100895ac9466;hpb=9639bd175726b73f8fe664b5ced12a72407b1f0b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts index a411e973b..83be9cd1e 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts @@ -1,134 +1,150 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import * as chai from 'chai' import 'mocha' +import * as chai from 'chai' import { - addVideoChannel, + cleanupTests, createUser, - deleteVideoChannel, flushAndRunMultipleServers, - flushTests, - getVideoChannelsList, getVideoChannelVideos, - killallServers, + getVideoChannelVideos, + SearchCommand, ServerInfo, setAccessTokensToServers, - updateMyUser, updateVideo, - updateVideoChannel, + updateMyUser, + updateVideo, uploadVideo, userLogin, - wait -} from '../../../../shared/utils' -import { waitJobs } from '../../../../shared/utils/server/jobs' -import { VideoChannel } from '../../../../shared/models/videos' -import { searchVideoChannel } from '../../../../shared/utils/search/video-channels' + wait, + waitJobs +} from '@shared/extra-utils' +import { VideoChannel } from '@shared/models' const expect = chai.expect -describe('Test a ActivityPub video channels search', function () { +describe('Test ActivityPub video channels search', function () { let servers: ServerInfo[] let userServer2Token: string let videoServer2UUID: string let channelIdServer2: number + let command: SearchCommand before(async function () { this.timeout(120000) - await flushTests() - servers = await flushAndRunMultipleServers(2) await setAccessTokensToServers(servers) { - await createUser(servers[0].url, servers[0].accessToken, 'user1_server1', 'password') + await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: 'user1_server1', password: 'password' }) const channel = { name: 'channel1_server1', displayName: 'Channel 1 server 1' } - await addVideoChannel(servers[0].url, servers[0].accessToken, channel) + await servers[0].channelsCommand.create({ attributes: channel }) } { const user = { username: 'user1_server2', password: 'password' } - await createUser(servers[1].url, servers[1].accessToken, user.username, user.password) + await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password }) userServer2Token = await userLogin(servers[1], user) const channel = { name: 'channel1_server2', displayName: 'Channel 1 server 2' } - const resChannel = await addVideoChannel(servers[1].url, userServer2Token, channel) - channelIdServer2 = resChannel.body.videoChannel.id + const created = await servers[1].channelsCommand.create({ token: userServer2Token, attributes: channel }) + channelIdServer2 = created.id const res = await uploadVideo(servers[1].url, userServer2Token, { name: 'video 1 server 2', channelId: channelIdServer2 }) videoServer2UUID = res.body.video.uuid } await waitJobs(servers) + + command = servers[0].searchCommand }) it('Should not find a remote video channel', async function () { + this.timeout(15000) + { - const search = 'http://localhost:9002/video-channels/channel1_server3' - const res = await searchVideoChannel(servers[ 0 ].url, search, servers[ 0 ].accessToken) + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server3' + const body = await command.searchChannels({ 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:9002/video-channels/channel1_server2' - const res = await searchVideoChannel(servers[0].url, search) + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const body = await command.searchChannels({ 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 video channel', async function () { const searches = [ - 'http://localhost:9001/video-channels/channel1_server1', - 'channel1_server1@localhost:9001' + 'http://localhost:' + servers[0].port + '/video-channels/channel1_server1', + 'channel1_server1@localhost:' + servers[0].port ] for (const search of searches) { - const res = await searchVideoChannel(servers[ 0 ].url, search) + const body = await command.searchChannels({ 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 ].name).to.equal('channel1_server1') - expect(res.body.data[ 0 ].displayName).to.equal('Channel 1 server 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].name).to.equal('channel1_server1') + expect(body.data[0].displayName).to.equal('Channel 1 server 1') + } + }) + + it('Should search a local video channel with an alternative URL', async function () { + const search = 'http://localhost:' + servers[0].port + '/c/channel1_server1' + + for (const token of [ undefined, servers[0].accessToken ]) { + const body = await command.searchChannels({ 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].name).to.equal('channel1_server1') + expect(body.data[0].displayName).to.equal('Channel 1 server 1') } }) it('Should search a remote video channel with URL or handle', async function () { const searches = [ - 'http://localhost:9002/video-channels/channel1_server2', - 'channel1_server2@localhost:9002' + 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2', + 'http://localhost:' + servers[1].port + '/c/channel1_server2', + 'http://localhost:' + servers[1].port + '/c/channel1_server2/videos', + 'channel1_server2@localhost:' + servers[1].port ] for (const search of searches) { - const res = await searchVideoChannel(servers[ 0 ].url, search, servers[ 0 ].accessToken) + const body = await command.searchChannels({ 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 ].name).to.equal('channel1_server2') - expect(res.body.data[ 0 ].displayName).to.equal('Channel 1 server 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].name).to.equal('channel1_server2') + expect(body.data[0].displayName).to.equal('Channel 1 server 2') } }) it('Should not list this remote video channel', async function () { - const res = await getVideoChannelsList(servers[0].url, 0, 5) - expect(res.body.total).to.equal(3) - expect(res.body.data).to.have.lengthOf(3) - expect(res.body.data[0].name).to.equal('channel1_server1') - expect(res.body.data[1].name).to.equal('user1_server1_channel') - expect(res.body.data[2].name).to.equal('root_channel') + const body = await servers[0].channelsCommand.list() + expect(body.total).to.equal(3) + expect(body.data).to.have.lengthOf(3) + expect(body.data[0].name).to.equal('channel1_server1') + expect(body.data[1].name).to.equal('user1_server1_channel') + expect(body.data[2].name).to.equal('root_channel') }) it('Should list video channel videos of server 2 without token', async function () { @@ -136,13 +152,13 @@ describe('Test a ActivityPub video channels search', function () { await waitJobs(servers) - const res = await getVideoChannelVideos(servers[0].url, null, 'channel1_server2@localhost:9002', 0, 5) + const res = await getVideoChannelVideos(servers[0].url, null, 'channel1_server2@localhost:' + servers[1].port, 0, 5) expect(res.body.total).to.equal(0) expect(res.body.data).to.have.lengthOf(0) }) it('Should list video channel videos of server 2 with token', async function () { - const res = await getVideoChannelVideos(servers[0].url, servers[0].accessToken, 'channel1_server2@localhost:9002', 0, 5) + const res = await getVideoChannelVideos(servers[0].url, servers[0].accessToken, 'channel1_server2@localhost:' + servers[1].port, 0, 5) expect(res.body.total).to.equal(1) expect(res.body.data[0].name).to.equal('video 1 server 2') @@ -151,19 +167,23 @@ describe('Test a ActivityPub video channels search', function () { it('Should update video channel of server 2, and refresh it on server 1', async function () { this.timeout(60000) - await updateVideoChannel(servers[1].url, userServer2Token, 'channel1_server2', { displayName: 'channel updated' }) + await servers[1].channelsCommand.update({ + token: userServer2Token, + channelName: 'channel1_server2', + attributes: { displayName: 'channel updated' } + }) await updateMyUser({ url: servers[1].url, accessToken: userServer2Token, displayName: 'user updated' }) await waitJobs(servers) // Expire video channel await wait(10000) - const search = 'http://localhost:9002/video-channels/channel1_server2' - const res = await searchVideoChannel(servers[0].url, search, servers[0].accessToken) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.have.lengthOf(1) + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const body = await command.searchChannels({ search, token: servers[0].accessToken }) + expect(body.total).to.equal(1) + expect(body.data).to.have.lengthOf(1) - const videoChannel: VideoChannel = res.body.data[0] + const videoChannel: VideoChannel = body.data[0] expect(videoChannel.displayName).to.equal('channel updated') // We don't return the owner account for now @@ -181,12 +201,13 @@ describe('Test a ActivityPub video channels search', function () { // Expire video channel await wait(10000) - const search = 'http://localhost:9002/video-channels/channel1_server2' - await searchVideoChannel(servers[0].url, search, servers[0].accessToken) + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + await command.searchChannels({ search, token: servers[0].accessToken }) await waitJobs(servers) - const res = await getVideoChannelVideos(servers[0].url, servers[0].accessToken, 'channel1_server2@localhost:9002', 0, 5, '-createdAt') + const videoChannelName = 'channel1_server2@localhost:' + servers[1].port + const res = await getVideoChannelVideos(servers[0].url, servers[0].accessToken, videoChannelName, 0, 5, '-createdAt') expect(res.body.total).to.equal(2) expect(res.body.data[0].name).to.equal('video 2 server 2') @@ -196,23 +217,19 @@ describe('Test a ActivityPub video channels search', function () { it('Should delete video channel of server 2, and delete it on server 1', async function () { this.timeout(60000) - await deleteVideoChannel(servers[1].url, userServer2Token, 'channel1_server2') + await servers[1].channelsCommand.delete({ token: userServer2Token, channelName: 'channel1_server2' }) await waitJobs(servers) // Expire video await wait(10000) - const res = await searchVideoChannel(servers[0].url, 'http://localhost:9002/video-channels/channel1_server2', servers[0].accessToken) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.have.lengthOf(0) + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const body = await command.searchChannels({ search, token: servers[0].accessToken }) + expect(body.total).to.equal(0) + expect(body.data).to.have.lengthOf(0) }) after(async function () { - killallServers(servers) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests(servers) }) })