X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fauto-follows.ts;h=9666e61dd5bd6dc526f4b0a3798ffdb80af83306;hb=e0faa8ad6e18ce6248ef1ec93a59dab5b05be468;hp=a06f578fc4d1039dd74e7e639f7c7e2762581b8c;hpb=97ecddae104f4013d261f0e9645e8b319ff0f1a6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts index a06f578fc..9666e61dd 100644 --- a/server/tests/api/server/auto-follows.ts +++ b/server/tests/api/server/auto-follows.ts @@ -1,67 +1,42 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import * as chai from 'chai' -import 'mocha' -import { - acceptFollower, - cleanupTests, - flushAndRunMultipleServers, - MockInstancesIndex, - ServerInfo, - setAccessTokensToServers, - unfollow, - updateCustomSubConfig, - wait -} from '../../../../shared/extra-utils/index' -import { follow, getFollowersListPaginationAndSort, getFollowingListPaginationAndSort } from '../../../../shared/extra-utils/server/follows' -import { waitJobs } from '../../../../shared/extra-utils/server/jobs' -import { ActorFollow } from '../../../../shared/models/actors' +import { MockInstancesIndex } from '@server/tests/shared' +import { wait } from '@shared/core-utils' +import { cleanupTests, createMultipleServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' const expect = chai.expect -async function checkFollow (follower: ServerInfo, following: ServerInfo, exists: boolean) { +async function checkFollow (follower: PeerTubeServer, following: PeerTubeServer, exists: boolean) { { - const res = await getFollowersListPaginationAndSort({ url: following.url, start: 0, count: 5, sort: '-createdAt' }) - const follows = res.body.data as ActorFollow[] + const body = await following.follows.getFollowers({ start: 0, count: 5, sort: '-createdAt' }) + const follow = body.data.find(f => f.follower.host === follower.host && f.state === 'accepted') - const follow = follows.find(f => { - return f.follower.host === follower.host && f.state === 'accepted' - }) - - if (exists === true) { - expect(follow).to.exist - } else { - expect(follow).to.be.undefined - } + if (exists === true) expect(follow, `Follower ${follower.url} should exist on ${following.url}`).to.exist + else expect(follow, `Follower ${follower.url} should not exist on ${following.url}`).to.be.undefined } { - const res = await getFollowingListPaginationAndSort({ url: follower.url, start: 0, count: 5, sort: '-createdAt' }) - const follows = res.body.data as ActorFollow[] - - const follow = follows.find(f => { - return f.following.host === following.host && f.state === 'accepted' - }) + const body = await follower.follows.getFollowings({ start: 0, count: 5, sort: '-createdAt' }) + const follow = body.data.find(f => f.following.host === following.host && f.state === 'accepted') - if (exists === true) { - expect(follow).to.exist - } else { - expect(follow).to.be.undefined - } + if (exists === true) expect(follow, `Following ${following.url} should exist on ${follower.url}`).to.exist + else expect(follow, `Following ${following.url} should not exist on ${follower.url}`).to.be.undefined } } -async function server1Follows2 (servers: ServerInfo[]) { - await follow(servers[0].url, [ servers[1].host ], servers[0].accessToken) +async function server1Follows2 (servers: PeerTubeServer[]) { + await servers[0].follows.follow({ hosts: [ servers[1].host ] }) await waitJobs(servers) } -async function resetFollows (servers: ServerInfo[]) { +async function resetFollows (servers: PeerTubeServer[]) { try { - await unfollow(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ]) - await unfollow(servers[ 1 ].url, servers[ 1 ].accessToken, servers[ 0 ]) - } catch { /* empty */ } + await servers[0].follows.unfollow({ target: servers[1] }) + await servers[1].follows.unfollow({ target: servers[0] }) + } catch { /* empty */ + } await waitJobs(servers) @@ -70,12 +45,12 @@ async function resetFollows (servers: ServerInfo[]) { } describe('Test auto follows', function () { - let servers: ServerInfo[] = [] + let servers: PeerTubeServer[] = [] before(async function () { - this.timeout(30000) + this.timeout(120000) - servers = await flushAndRunMultipleServers(3) + servers = await createMultipleServers(3) // Get the access tokens await setAccessTokensToServers(servers) @@ -104,7 +79,7 @@ describe('Test auto follows', function () { } } } - await updateCustomSubConfig(servers[1].url, servers[1].accessToken, config) + await servers[1].config.updateCustomSubConfig({ newConfig: config }) await server1Follows2(servers) @@ -129,14 +104,14 @@ describe('Test auto follows', function () { } } } - await updateCustomSubConfig(servers[1].url, servers[1].accessToken, config) + await servers[1].config.updateCustomSubConfig({ newConfig: config }) await server1Follows2(servers) await checkFollow(servers[0], servers[1], false) await checkFollow(servers[1], servers[0], false) - await acceptFollower(servers[1].url, servers[1].accessToken, 'peertube@' + servers[0].host) + await servers[1].follows.acceptFollower({ follower: 'peertube@' + servers[0].host }) await waitJobs(servers) await checkFollow(servers[0], servers[1], true) @@ -146,15 +121,16 @@ describe('Test auto follows', function () { config.followings.instance.autoFollowBack.enabled = false config.followers.instance.manualApproval = false - await updateCustomSubConfig(servers[1].url, servers[1].accessToken, config) + await servers[1].config.updateCustomSubConfig({ newConfig: config }) }) }) describe('Auto follow index', function () { const instanceIndexServer = new MockInstancesIndex() + let port: number before(async () => { - await instanceIndexServer.initialize() + port = await instanceIndexServer.initialize() }) it('Should not auto follow index if the option is not enabled', async function () { @@ -163,8 +139,8 @@ describe('Test auto follows', function () { await wait(5000) await waitJobs(servers) - await checkFollow(servers[ 0 ], servers[ 1 ], false) - await checkFollow(servers[ 1 ], servers[ 0 ], false) + await checkFollow(servers[0], servers[1], false) + await checkFollow(servers[1], servers[0], false) }) it('Should auto follow the index', async function () { @@ -176,18 +152,18 @@ describe('Test auto follows', function () { followings: { instance: { autoFollowIndex: { - indexUrl: 'http://localhost:42100', + indexUrl: `http://localhost:${port}/api/v1/instances/hosts`, enabled: true } } } } - await updateCustomSubConfig(servers[0].url, servers[0].accessToken, config) + await servers[0].config.updateCustomSubConfig({ newConfig: config }) await wait(5000) await waitJobs(servers) - await checkFollow(servers[ 0 ], servers[ 1 ], true) + await checkFollow(servers[0], servers[1], true) await resetFollows(servers) }) @@ -200,8 +176,12 @@ describe('Test auto follows', function () { await wait(5000) await waitJobs(servers) - await checkFollow(servers[ 0 ], servers[ 1 ], false) - await checkFollow(servers[ 0 ], servers[ 2 ], true) + await checkFollow(servers[0], servers[1], false) + await checkFollow(servers[0], servers[2], true) + }) + + after(async function () { + await instanceIndexServer.terminate() }) })