X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fauto-follows.ts;h=e04d70af4a44dc77d6ca3576181566d0e97ed3af;hb=8b6f0fd53d12faf54a58602a8bcfab05e8b5947b;hp=df468034cf6e4dd3e64bbe7234bb5f81c81c7537;hpb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts
index df468034c..e04d70af4 100644
--- a/server/tests/api/server/auto-follows.ts
+++ b/server/tests/api/server/auto-follows.ts
@@ -1,4 +1,4 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import * as chai from 'chai'
 import 'mocha'
@@ -21,7 +21,7 @@ const expect = chai.expect
 
 async function checkFollow (follower: ServerInfo, following: ServerInfo, exists: boolean) {
   {
-    const res = await getFollowersListPaginationAndSort(following.url, 0, 5, '-createdAt')
+    const res = await getFollowersListPaginationAndSort({ url: following.url, start: 0, count: 5, sort: '-createdAt' })
     const follows = res.body.data as ActorFollow[]
 
     const follow = follows.find(f => {
@@ -36,7 +36,7 @@ async function checkFollow (follower: ServerInfo, following: ServerInfo, exists:
   }
 
   {
-    const res = await getFollowingListPaginationAndSort(follower.url, 0, 5, '-createdAt')
+    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 => {
@@ -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)
 
@@ -163,8 +164,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 +177,7 @@ describe('Test auto follows', function () {
         followings: {
           instance: {
             autoFollowIndex: {
-              indexUrl: 'http://localhost:42100',
+              indexUrl: 'http://localhost:42101/api/v1/instances/hosts',
               enabled: true
             }
           }
@@ -187,7 +188,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 +201,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)
     })
   })