X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsearch%2Fsearch-activitypub-video-channels.ts;h=003bd34d03ce0f22c0378e7a6dee5255ba0e457a;hb=HEAD;hp=b33f282663f38228356ebcea5b43cd73e3add6ef;hpb=c0e8b12e7fd554ba4d2ceb0c4900804c6a4c63ea;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 b33f28266..003bd34d0 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts @@ -1,19 +1,18 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import 'mocha' -import * as chai from 'chai' +import { expect } from 'chai' +import { wait } from '@shared/core-utils' +import { VideoChannel } from '@shared/models' import { cleanupTests, createMultipleServers, - SearchCommand, PeerTubeServer, + SearchCommand, setAccessTokensToServers, - wait, + setDefaultAccountAvatar, + setDefaultVideoChannel, waitJobs -} from '@shared/extra-utils' -import { VideoChannel } from '@shared/models' - -const expect = chai.expect +} from '@shared/server-commands' describe('Test ActivityPub video channels search', function () { let servers: PeerTubeServer[] @@ -28,6 +27,8 @@ describe('Test ActivityPub video channels search', function () { servers = await createMultipleServers(2) await setAccessTokensToServers(servers) + await setDefaultVideoChannel(servers) + await setDefaultAccountAvatar(servers) { await servers[0].users.create({ username: 'user1_server1', password: 'password' }) @@ -64,7 +65,7 @@ describe('Test ActivityPub video channels search', function () { this.timeout(15000) { - const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server3' + const search = servers[1].url + '/video-channels/channel1_server3' const body = await command.searchChannels({ search, token: servers[0].accessToken }) expect(body.total).to.equal(0) @@ -74,7 +75,7 @@ describe('Test ActivityPub video channels search', function () { { // Without token - const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const search = servers[1].url + '/video-channels/channel1_server2' const body = await command.searchChannels({ search }) expect(body.total).to.equal(0) @@ -85,8 +86,8 @@ describe('Test ActivityPub video channels search', function () { it('Should search a local video channel', async function () { const searches = [ - 'http://localhost:' + servers[0].port + '/video-channels/channel1_server1', - 'channel1_server1@localhost:' + servers[0].port + servers[0].url + '/video-channels/channel1_server1', + 'channel1_server1@' + servers[0].host ] for (const search of searches) { @@ -101,7 +102,7 @@ describe('Test ActivityPub video channels search', function () { }) it('Should search a local video channel with an alternative URL', async function () { - const search = 'http://localhost:' + servers[0].port + '/c/channel1_server1' + const search = servers[0].url + '/c/channel1_server1' for (const token of [ undefined, servers[0].accessToken ]) { const body = await command.searchChannels({ search, token }) @@ -114,12 +115,31 @@ describe('Test ActivityPub video channels search', function () { } }) + it('Should search a local video channel with a query in URL', async function () { + const searches = [ + servers[0].url + '/video-channels/channel1_server1', + servers[0].url + '/c/channel1_server1' + ] + + for (const search of searches) { + for (const token of [ undefined, servers[0].accessToken ]) { + const body = await command.searchChannels({ search: search + '?param=2', 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:' + 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 + servers[1].url + '/video-channels/channel1_server2', + servers[1].url + '/c/channel1_server2', + servers[1].url + '/c/channel1_server2/videos', + 'channel1_server2@' + servers[1].host ] for (const search of searches) { @@ -149,7 +169,7 @@ describe('Test ActivityPub video channels search', function () { const { total, data } = await servers[0].videos.listByChannel({ token: null, - handle: 'channel1_server2@localhost:' + servers[1].port + handle: 'channel1_server2@' + servers[1].host }) expect(total).to.equal(0) expect(data).to.have.lengthOf(0) @@ -157,7 +177,7 @@ describe('Test ActivityPub video channels search', function () { it('Should list video channel videos of server 2 with token', async function () { const { total, data } = await servers[0].videos.listByChannel({ - handle: 'channel1_server2@localhost:' + servers[1].port + handle: 'channel1_server2@' + servers[1].host }) expect(total).to.equal(1) @@ -165,7 +185,7 @@ describe('Test ActivityPub video channels search', function () { }) it('Should update video channel of server 2, and refresh it on server 1', async function () { - this.timeout(60000) + this.timeout(120000) await servers[1].channels.update({ token: userServer2Token, @@ -178,7 +198,7 @@ describe('Test ActivityPub video channels search', function () { // Expire video channel await wait(10000) - const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const search = servers[1].url + '/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) @@ -191,7 +211,7 @@ describe('Test ActivityPub video channels search', function () { }) it('Should update and add a video on server 2, and update it on server 1 after a search', async function () { - this.timeout(60000) + this.timeout(120000) await servers[1].videos.update({ token: userServer2Token, id: videoServer2UUID, attributes: { name: 'video 1 updated' } }) await servers[1].videos.upload({ token: userServer2Token, attributes: { name: 'video 2 server 2', channelId: channelIdServer2 } }) @@ -201,12 +221,12 @@ describe('Test ActivityPub video channels search', function () { // Expire video channel await wait(10000) - const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const search = servers[1].url + '/video-channels/channel1_server2' await command.searchChannels({ search, token: servers[0].accessToken }) await waitJobs(servers) - const handle = 'channel1_server2@localhost:' + servers[1].port + const handle = 'channel1_server2@' + servers[1].host const { total, data } = await servers[0].videos.listByChannel({ handle, sort: '-createdAt' }) expect(total).to.equal(2) @@ -215,7 +235,7 @@ describe('Test ActivityPub video channels search', function () { }) it('Should delete video channel of server 2, and delete it on server 1', async function () { - this.timeout(60000) + this.timeout(120000) await servers[1].channels.delete({ token: userServer2Token, channelName: 'channel1_server2' }) @@ -223,7 +243,7 @@ describe('Test ActivityPub video channels search', function () { // Expire video await wait(10000) - const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const search = servers[1].url + '/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)