X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsearch%2Fsearch-activitypub-video-channels.ts;h=cf5158b6670a38a2b8c255ce987f2060e9f57323;hb=57f879a540551c3b958b0991c8e1e3657a4481d8;hp=512cb32fd655f5d54deba7ce0eebebc42c36caf7;hpb=f5b0af50c85e2f8b6b2b054ac1f47123cacbe08d;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 512cb32fd..cf5158b66 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts @@ -1,44 +1,46 @@ -/* 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, - killallServers, + getVideoChannelVideos, + SearchCommand, ServerInfo, setAccessTokensToServers, updateMyUser, + updateVideo, updateVideoChannel, uploadVideo, userLogin, - wait -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' -import { VideoChannel } from '../../../../shared/models/videos' -import { searchVideoChannel } from '../../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' @@ -48,7 +50,7 @@ describe('Test a ActivityPub video channels search', function () { { 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 = { @@ -56,67 +58,87 @@ describe('Test a ActivityPub video channels search', function () { displayName: 'Channel 1 server 2' } const resChannel = await addVideoChannel(servers[1].url, userServer2Token, channel) - const channelId = resChannel.body.videoChannel.id + channelIdServer2 = resChannel.body.videoChannel.id - await uploadVideo(servers[1].url, userServer2Token, { name: 'video 1 server 2', channelId }) - await uploadVideo(servers[1].url, userServer2Token, { name: 'video 2 server 2', channelId }) + 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(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(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 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') } }) @@ -129,6 +151,23 @@ describe('Test a ActivityPub video channels search', function () { expect(res.body.data[2].name).to.equal('root_channel') }) + it('Should list video channel videos of server 2 without token', async function () { + this.timeout(30000) + + await waitJobs(servers) + + 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:' + servers[1].port, 0, 5) + + expect(res.body.total).to.equal(1) + expect(res.body.data[0].name).to.equal('video 1 server 2') + }) + it('Should update video channel of server 2, and refresh it on server 1', async function () { this.timeout(60000) @@ -139,18 +178,42 @@ describe('Test a ActivityPub video channels search', function () { // 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 // expect(videoChannel.ownerAccount.displayName).to.equal('user updated') }) + it('Should update and add a video on server 2, and update it on server 1 after a search', async function () { + this.timeout(60000) + + await updateVideo(servers[1].url, userServer2Token, videoServer2UUID, { name: 'video 1 updated' }) + await uploadVideo(servers[1].url, userServer2Token, { name: 'video 2 server 2', channelId: channelIdServer2 }) + + await waitJobs(servers) + + // Expire video channel + await wait(10000) + + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + await command.searchChannels({ search, token: servers[0].accessToken }) + + await waitJobs(servers) + + 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') + expect(res.body.data[1].name).to.equal('video 1 updated') + }) + it('Should delete video channel of server 2, and delete it on server 1', async function () { this.timeout(60000) @@ -160,17 +223,13 @@ describe('Test a ActivityPub video channels search', function () { // 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) }) })