X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fauto-follows.ts;h=1519b263fb0eb54dac0c53d3b69b817a83fd800b;hb=693c6586cb896a84ff0f897b1c242bcf7bdcbaee;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..1519b263f 100644 --- a/server/tests/api/server/auto-follows.ts +++ b/server/tests/api/server/auto-follows.ts @@ -1,7 +1,7 @@ -/* 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 { acceptFollower, cleanupTests, @@ -59,9 +59,10 @@ async function server1Follows2 (servers: ServerInfo[]) { async function resetFollows (servers: ServerInfo[]) { try { - await unfollow(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ]) - await unfollow(servers[ 1 ].url, servers[ 1 ].accessToken, servers[ 0 ]) - } catch { /* empty */ } + await unfollow(servers[0].url, servers[0].accessToken, servers[1]) + await unfollow(servers[1].url, servers[1].accessToken, servers[0]) + } catch { /* empty */ + } await waitJobs(servers) @@ -152,9 +153,10 @@ describe('Test auto follows', function () { 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 +165,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,7 +178,7 @@ describe('Test auto follows', function () { followings: { instance: { autoFollowIndex: { - indexUrl: 'http://localhost:42100', + indexUrl: `http://localhost:${port}/api/v1/instances/hosts`, enabled: true } } @@ -187,7 +189,7 @@ describe('Test auto follows', function () { 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 +202,8 @@ 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) }) })