X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsearch%2Fsearch-activitypub-video-channels.ts;h=d7e3ed5be42a857979d8bb808870d744e37bc9d7;hb=a15871560f80e07386c1dabb8370cd2664ecfd1f;hp=a411e973bdc1bca4058860a1796e100895ac9466;hpb=2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f;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..d7e3ed5be 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts @@ -1,30 +1,31 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import * as chai from 'chai' import 'mocha' import { addVideoChannel, + cleanupTests, createUser, deleteVideoChannel, flushAndRunMultipleServers, - flushTests, - getVideoChannelsList, getVideoChannelVideos, - killallServers, + getVideoChannelsList, + getVideoChannelVideos, ServerInfo, setAccessTokensToServers, - updateMyUser, updateVideo, + updateMyUser, + updateVideo, updateVideoChannel, uploadVideo, userLogin, wait -} from '../../../../shared/utils' -import { waitJobs } from '../../../../shared/utils/server/jobs' +} from '../../../../shared/extra-utils' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' import { VideoChannel } from '../../../../shared/models/videos' -import { searchVideoChannel } from '../../../../shared/utils/search/video-channels' +import { searchVideoChannel } from '../../../../shared/extra-utils/search/video-channels' 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 @@ -33,14 +34,12 @@ describe('Test a ActivityPub video channels search', function () { 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' @@ -50,7 +49,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 = { @@ -68,9 +67,11 @@ describe('Test a ActivityPub video channels search', function () { }) 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 res = await searchVideoChannel(servers[0].url, search, servers[0].accessToken) expect(res.body.total).to.equal(0) expect(res.body.data).to.be.an('array') @@ -79,7 +80,7 @@ describe('Test a ActivityPub video channels search', function () { { // Without token - const search = 'http://localhost:9002/video-channels/channel1_server2' + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' const res = await searchVideoChannel(servers[0].url, search) expect(res.body.total).to.equal(0) @@ -90,35 +91,35 @@ describe('Test a ActivityPub video channels search', function () { 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 res = await searchVideoChannel(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 ].name).to.equal('channel1_server1') - expect(res.body.data[ 0 ].displayName).to.equal('Channel 1 server 1') + expect(res.body.data[0].name).to.equal('channel1_server1') + expect(res.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', + 'channel1_server2@localhost:' + servers[1].port ] for (const search of searches) { - const res = await searchVideoChannel(servers[ 0 ].url, search, servers[ 0 ].accessToken) + const res = await searchVideoChannel(servers[0].url, search, 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(res.body.data[0].name).to.equal('channel1_server2') + expect(res.body.data[0].displayName).to.equal('Channel 1 server 2') } }) @@ -136,13 +137,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') @@ -158,7 +159,7 @@ describe('Test a ActivityPub video channels search', function () { // Expire video channel await wait(10000) - const search = 'http://localhost:9002/video-channels/channel1_server2' + const search = 'http://localhost:' + servers[1].port + '/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) @@ -181,12 +182,13 @@ describe('Test a ActivityPub video channels search', function () { // Expire video channel await wait(10000) - const search = 'http://localhost:9002/video-channels/channel1_server2' + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' await searchVideoChannel(servers[0].url, search, 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') @@ -202,17 +204,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) + const search = 'http://localhost:' + servers[1].port + '/video-channels/channel1_server2' + const res = await searchVideoChannel(servers[0].url, search, servers[0].accessToken) expect(res.body.total).to.equal(0) expect(res.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) }) })