Merge branch 'release/2.2.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / extra-utils / server / follows.ts

diff --git a/shared/extra-utils/server/follows.ts b/shared/extra-utils/server/follows.ts
index 68c5a2e2b24cd6115ab3c4b6a8a387742e645965..006d591995aed439baf9b9ca787383ae81f102a6 100644 (file)
--- a/shared/extra-utils/server/follows.ts
+++ b/shared/extra-utils/server/follows.ts
@@ -2,16 +2,32 @@ import * as request from 'supertest'
 import { ServerInfo } from './servers'
 import { waitJobs } from './jobs'
 import { makePostBodyRequest } from '../requests/requests'
-
-function getFollowersListPaginationAndSort (url: string, start: number, count: number, sort: string, search?: string) {
+import { ActivityPubActorType, FollowState } from '@shared/models'
+
+function getFollowersListPaginationAndSort (options: {
+  url: string
+  start: number
+  count: number
+  sort: string
+  search?: string
+  actorType?: ActivityPubActorType
+  state?: FollowState
+}) {
+  const { url, start, count, sort, search, state, actorType } = options
   const path = '/api/v1/server/followers'
 
+  const query = {
+    start,
+    count,
+    sort,
+    search,
+    state,
+    actorType
+  }
+
   return request(url)
     .get(path)
-    .query({ start })
-    .query({ count })
-    .query({ sort })
-    .query({ search })
+    .query(query)
     .set('Accept', 'application/json')
     .expect(200)
     .expect('Content-Type', /json/)
@@ -39,15 +55,30 @@ function rejectFollower (url: string, token: string, follower: string, statusCod
   })
 }
 
-function getFollowingListPaginationAndSort (url: string, start: number, count: number, sort: string, search?: string) {
+function getFollowingListPaginationAndSort (options: {
+  url: string
+  start: number
+  count: number
+  sort: string
+  search?: string
+  actorType?: ActivityPubActorType
+  state?: FollowState
+}) {
+  const { url, start, count, sort, search, state, actorType } = options
   const path = '/api/v1/server/following'
 
+  const query = {
+    start,
+    count,
+    sort,
+    search,
+    state,
+    actorType
+  }
+
   return request(url)
     .get(path)
-    .query({ start })
-    .query({ count })
-    .query({ sort })
-    .query({ search })
+    .query(query)
     .set('Accept', 'application/json')
     .expect(200)
     .expect('Content-Type', /json/)
@@ -61,7 +92,7 @@ function follow (follower: string, following: string[], accessToken: string, exp
     .post(path)
     .set('Accept', 'application/json')
     .set('Authorization', 'Bearer ' + accessToken)
-    .send({ 'hosts': followingHosts })
+    .send({ hosts: followingHosts })
     .expect(expectedStatus)
 }