X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fexternal-plugins%2Fauto-block-videos.ts;h=95d7a4b58a5908185ca8f65aef1fb89d03bda6d7;hb=33b91e53d21fba295ecf516b717fb36e91990771;hp=6baf3756600b08d0d45c10015311eaf2d258d2a3;hpb=ae2abfd3aed3e75d39a316b49b914d187faa7475;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/external-plugins/auto-block-videos.ts b/server/tests/external-plugins/auto-block-videos.ts index 6baf37566..95d7a4b58 100644 --- a/server/tests/external-plugins/auto-block-videos.ts +++ b/server/tests/external-plugins/auto-block-videos.ts @@ -1,86 +1,76 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import 'mocha' import { expect } from 'chai' -import { Video, VideoBlacklist } from '@shared/models' -import { - doubleFollow, - getBlacklistedVideosList, - getVideosList, - MockBlocklist, - removeVideoFromBlacklist, - setAccessTokensToServers, - uploadVideoAndGetId, - wait -} from '../../../shared/extra-utils' +import { wait } from '@shared/core-utils' +import { Video } from '@shared/models' import { cleanupTests, - flushAndRunMultipleServers, + createMultipleServers, + doubleFollow, killallServers, - reRunServer, - ServerInfo -} from '../../../shared/extra-utils/server/servers' + PeerTubeServer, + setAccessTokensToServers +} from '@shared/server-commands' +import { MockBlocklist } from '../shared' -async function check (server: ServerInfo, videoUUID: string, exists = true) { - const res = await getVideosList(server.url) +async function check (server: PeerTubeServer, videoUUID: string, exists = true) { + const { data } = await server.videos.list() - const video = res.body.data.find(v => v.uuid === videoUUID) + const video = data.find(v => v.uuid === videoUUID) if (exists) expect(video).to.not.be.undefined else expect(video).to.be.undefined } describe('Official plugin auto-block videos', function () { - let servers: ServerInfo[] + let servers: PeerTubeServer[] let blocklistServer: MockBlocklist let server1Videos: Video[] = [] let server2Videos: Video[] = [] let port: number before(async function () { - this.timeout(60000) + this.timeout(120000) - servers = await flushAndRunMultipleServers(2) + servers = await createMultipleServers(2) await setAccessTokensToServers(servers) for (const server of servers) { - await server.pluginsCommand.install({ npmName: 'peertube-plugin-auto-block-videos' }) + await server.plugins.install({ npmName: 'peertube-plugin-auto-block-videos' }) } blocklistServer = new MockBlocklist() port = await blocklistServer.initialize() - await uploadVideoAndGetId({ server: servers[0], videoName: 'video server 1' }) - await uploadVideoAndGetId({ server: servers[1], videoName: 'video server 2' }) - await uploadVideoAndGetId({ server: servers[1], videoName: 'video 2 server 2' }) - await uploadVideoAndGetId({ server: servers[1], videoName: 'video 3 server 2' }) + await servers[0].videos.quickUpload({ name: 'video server 1' }) + await servers[1].videos.quickUpload({ name: 'video server 2' }) + await servers[1].videos.quickUpload({ name: 'video 2 server 2' }) + await servers[1].videos.quickUpload({ name: 'video 3 server 2' }) { - const res = await getVideosList(servers[0].url) - server1Videos = res.body.data.map(v => Object.assign(v, { url: servers[0].url + '/videos/watch/' + v.uuid })) + const { data } = await servers[0].videos.list() + server1Videos = data.map(v => Object.assign(v, { url: servers[0].url + '/videos/watch/' + v.uuid })) } { - const res = await getVideosList(servers[1].url) - server2Videos = res.body.data.map(v => Object.assign(v, { url: servers[1].url + '/videos/watch/' + v.uuid })) + const { data } = await servers[1].videos.list() + server2Videos = data.map(v => Object.assign(v, { url: servers[1].url + '/videos/watch/' + v.uuid })) } await doubleFollow(servers[0], servers[1]) }) it('Should update plugin settings', async function () { - await servers[0].pluginsCommand.updateSettings({ + await servers[0].plugins.updateSettings({ npmName: 'peertube-plugin-auto-block-videos', settings: { - 'blocklist-urls': `http://localhost:${port}/blocklist`, + 'blocklist-urls': `http://127.0.0.1:${port}/blocklist`, 'check-seconds-interval': 1 } }) }) it('Should auto block a video', async function () { - this.timeout(10000) - await check(servers[0], server2Videos[0].uuid, true) blocklistServer.replace({ @@ -97,18 +87,15 @@ describe('Official plugin auto-block videos', function () { }) it('Should have video in blacklists', async function () { - const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken }) - - const videoBlacklists = res.body.data as VideoBlacklist[] + const body = await servers[0].blacklist.list() + const videoBlacklists = body.data expect(videoBlacklists).to.have.lengthOf(1) expect(videoBlacklists[0].reason).to.contains('Automatically blocked from auto block plugin') expect(videoBlacklists[0].video.name).to.equal(server2Videos[0].name) }) it('Should not block a local video', async function () { - this.timeout(10000) - await check(servers[0], server1Videos[0].uuid, true) blocklistServer.replace({ @@ -125,8 +112,6 @@ describe('Official plugin auto-block videos', function () { }) it('Should remove a video block', async function () { - this.timeout(10000) - await check(servers[0], server2Videos[0].uuid, false) blocklistServer.replace({ @@ -163,12 +148,12 @@ describe('Official plugin auto-block videos', function () { await check(servers[0], video.uuid, false) - await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, video.uuid) + await servers[0].blacklist.remove({ videoId: video.uuid }) await check(servers[0], video.uuid, true) - killallServers([ servers[0] ]) - await reRunServer(servers[0]) + await killallServers([ servers[0] ]) + await servers[0].run() await wait(2000) await check(servers[0], video.uuid, true)