X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Ffollows-moderation.ts;h=120bd7f885bddafa3e433a2b0a5fe118bcb8648d;hb=7a4fd56ccd86518a6b14c407fc977c7904337448;hp=a360706f205df4f9bf28772bf5a8a97fd7acfe94;hpb=5b9c965d5aa747f29b081289f930ee215fdc23c8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/follows-moderation.ts b/server/tests/api/server/follows-moderation.ts index a360706f2..120bd7f88 100644 --- a/server/tests/api/server/follows-moderation.ts +++ b/server/tests/api/server/follows-moderation.ts @@ -1,83 +1,78 @@ -/* 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 { - flushAndRunMultipleServers, - killallServers, - ServerInfo, + cleanupTests, + createMultipleServers, + FollowsCommand, + PeerTubeServer, setAccessTokensToServers, - updateCustomSubConfig -} from '../../../../shared/utils/index' -import { - follow, - getFollowersListPaginationAndSort, - getFollowingListPaginationAndSort, - removeFollower -} from '../../../../shared/utils/server/follows' -import { waitJobs } from '../../../../shared/utils/server/jobs' -import { ActorFollow } from '../../../../shared/models/actors' + waitJobs +} from '@shared/server-commands' const expect = chai.expect -async function checkHasFollowers (servers: ServerInfo[]) { - { - const res = await getFollowingListPaginationAndSort(servers[0].url, 0, 5, 'createdAt') - expect(res.body.total).to.equal(1) +async function checkServer1And2HasFollowers (servers: PeerTubeServer[], state = 'accepted') { + const fns = [ + servers[0].follows.getFollowings.bind(servers[0].follows), + servers[1].follows.getFollowers.bind(servers[1].follows) + ] - const follow = res.body.data[0] as ActorFollow - expect(follow.follower.url).to.equal('http://localhost:9001/accounts/peertube') - expect(follow.following.url).to.equal('http://localhost:9002/accounts/peertube') - } - - { - const res = await getFollowersListPaginationAndSort(servers[1].url, 0, 5, 'createdAt') - expect(res.body.total).to.equal(1) + for (const fn of fns) { + const body = await fn({ start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(1) - const follow = res.body.data[0] as ActorFollow - expect(follow.follower.url).to.equal('http://localhost:9001/accounts/peertube') - expect(follow.following.url).to.equal('http://localhost:9002/accounts/peertube') + const follow = body.data[0] + expect(follow.state).to.equal(state) + expect(follow.follower.url).to.equal('http://localhost:' + servers[0].port + '/accounts/peertube') + expect(follow.following.url).to.equal('http://localhost:' + servers[1].port + '/accounts/peertube') } } -async function checkNoFollowers (servers: ServerInfo[]) { - { - const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 5, 'createdAt') - expect(res.body.total).to.equal(0) - } +async function checkNoFollowers (servers: PeerTubeServer[]) { + const fns = [ + servers[0].follows.getFollowings.bind(servers[0].follows), + servers[1].follows.getFollowers.bind(servers[1].follows) + ] - { - const res = await getFollowersListPaginationAndSort(servers[ 1 ].url, 0, 5, 'createdAt') - expect(res.body.total).to.equal(0) + for (const fn of fns) { + const body = await fn({ start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(0) } } describe('Test follows moderation', function () { - let servers: ServerInfo[] = [] + let servers: PeerTubeServer[] = [] + let commands: FollowsCommand[] before(async function () { this.timeout(30000) - servers = await flushAndRunMultipleServers(2) + servers = await createMultipleServers(3) // Get the access tokens await setAccessTokensToServers(servers) + + commands = servers.map(s => s.follows) }) it('Should have server 1 following server 2', async function () { this.timeout(30000) - await follow(servers[0].url, [ servers[1].url ], servers[0].accessToken) + await commands[0].follow({ hosts: [ servers[1].url ] }) await waitJobs(servers) }) it('Should have correct follows', async function () { - await checkHasFollowers(servers) + await checkServer1And2HasFollowers(servers) }) it('Should remove follower on server 2', async function () { - await removeFollower(servers[1].url, servers[1].accessToken, servers[0]) + this.timeout(10000) + + await commands[1].removeFollower({ follower: servers[0] }) await waitJobs(servers) }) @@ -87,40 +82,111 @@ describe('Test follows moderation', function () { }) it('Should disable followers on server 2', async function () { + this.timeout(10000) + const subConfig = { followers: { instance: { - enabled: false + enabled: false, + manualApproval: false } } } - await updateCustomSubConfig(servers[1].url, servers[1].accessToken, subConfig) + await servers[1].config.updateCustomSubConfig({ newConfig: subConfig }) - await follow(servers[0].url, [ servers[1].url ], servers[0].accessToken) + await commands[0].follow({ hosts: [ servers[1].url ] }) await waitJobs(servers) await checkNoFollowers(servers) }) it('Should re enable followers on server 2', async function () { + this.timeout(10000) + const subConfig = { followers: { instance: { - enabled: true + enabled: true, + manualApproval: false } } } - await updateCustomSubConfig(servers[1].url, servers[1].accessToken, subConfig) + await servers[1].config.updateCustomSubConfig({ newConfig: subConfig }) - await follow(servers[0].url, [ servers[1].url ], servers[0].accessToken) + await commands[0].follow({ hosts: [ servers[1].url ] }) await waitJobs(servers) - await checkHasFollowers(servers) + await checkServer1And2HasFollowers(servers) + }) + + it('Should manually approve followers', async function () { + this.timeout(20000) + + await commands[1].removeFollower({ follower: servers[0] }) + await waitJobs(servers) + + const subConfig = { + followers: { + instance: { + enabled: true, + manualApproval: true + } + } + } + + await servers[1].config.updateCustomSubConfig({ newConfig: subConfig }) + await servers[2].config.updateCustomSubConfig({ newConfig: subConfig }) + + await commands[0].follow({ hosts: [ servers[1].url ] }) + await waitJobs(servers) + + await checkServer1And2HasFollowers(servers, 'pending') + }) + + it('Should accept a follower', async function () { + this.timeout(10000) + + await commands[1].acceptFollower({ follower: 'peertube@localhost:' + servers[0].port }) + await waitJobs(servers) + + await checkServer1And2HasFollowers(servers) + }) + + it('Should reject another follower', async function () { + this.timeout(20000) + + await commands[0].follow({ hosts: [ servers[2].url ] }) + await waitJobs(servers) + + { + const body = await commands[0].getFollowings({ start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(2) + } + + { + const body = await commands[1].getFollowers({ start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(1) + } + + { + const body = await commands[2].getFollowers({ start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(1) + } + + await commands[2].rejectFollower({ follower: 'peertube@localhost:' + servers[0].port }) + await waitJobs(servers) + + await checkServer1And2HasFollowers(servers) + + { + const body = await commands[2].getFollowers({ start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(0) + } }) after(async function () { - killallServers(servers) + await cleanupTests(servers) }) })