X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Ffollows.ts;h=6121d22022c251f35595a08a6726eb402ace63bb;hb=bf54587a3e2ad9c2c186828f2a5682b91ee2cc00;hp=488666a754c814c25cd838118db70e8bb995665c;hpb=b8f4167fb6fa448125aeecff80b201d74e27fe6a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts
index 488666a75..6121d2202 100644
--- a/server/tests/api/check-params/follows.ts
+++ b/server/tests/api/check-params/follows.ts
@@ -1,32 +1,29 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-
-import {
-  cleanupTests,
-  createUser,
-  flushAndRunServer,
-  makeDeleteRequest, makeGetRequest,
-  makePostBodyRequest,
-  ServerInfo,
-  setAccessTokensToServers,
-  userLogin
-} from '../../../../shared/extra-utils'
 import {
   checkBadCountPagination,
   checkBadSortPagination,
-  checkBadStartPagination
-} from '../../../../shared/extra-utils/requests/check-api-params'
+  checkBadStartPagination,
+  cleanupTests,
+  createSingleServer,
+  makeDeleteRequest,
+  makeGetRequest,
+  makePostBodyRequest,
+  PeerTubeServer,
+  setAccessTokensToServers
+} from '@shared/server-commands'
+import { HttpStatusCode } from '@shared/models'
 
 describe('Test server follows API validators', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
 
   // ---------------------------------------------------------------
 
   before(async function () {
     this.timeout(30000)
 
-    server = await flushAndRunServer(1)
+    server = await createSingleServer(1)
 
     await setAccessTokensToServers([ server ])
   })
@@ -35,64 +32,68 @@ describe('Test server follows API validators', function () {
     let userAccessToken = null
 
     before(async function () {
-      const user = {
-        username: 'user1',
-        password: 'password'
-      }
-
-      await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.users.generateUserAndToken('user1')
     })
 
     describe('When adding follows', function () {
       const path = '/api/v1/server/following'
 
-      it('Should fail without hosts', async function () {
+      it('Should fail with nothing', async function () {
         await makePostBodyRequest({
           url: server.url,
           path,
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
-      it('Should fail if hosts is not an array', async function () {
+      it('Should fail if hosts is not composed by hosts', async function () {
         await makePostBodyRequest({
           url: server.url,
           path,
+          fields: { hosts: [ 'localhost:9002', 'localhost:coucou' ] },
           token: server.accessToken,
-          fields: { hosts: 'localhost:9002' },
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
-      it('Should fail if the array is not composed by hosts', async function () {
+      it('Should fail if hosts is composed with http schemes', async function () {
         await makePostBodyRequest({
           url: server.url,
           path,
-          fields: { hosts: [ 'localhost:9002', 'localhost:coucou' ] },
+          fields: { hosts: [ 'localhost:9002', 'http://localhost:9003' ] },
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
-      it('Should fail if the array is composed with http schemes', async function () {
+      it('Should fail if hosts are not unique', async function () {
         await makePostBodyRequest({
           url: server.url,
           path,
-          fields: { hosts: [ 'localhost:9002', 'http://localhost:9003' ] },
+          fields: { urls: [ 'localhost:9002', 'localhost:9002' ] },
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
-      it('Should fail if hosts are not unique', async function () {
+      it('Should fail if handles is not composed by handles', async function () {
         await makePostBodyRequest({
           url: server.url,
           path,
-          fields: { urls: [ 'localhost:9002', 'localhost:9002' ] },
+          fields: { handles: [ 'hello@example.com', 'localhost:9001' ] },
+          token: server.accessToken,
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
+        })
+      })
+
+      it('Should fail if handles are not unique', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          fields: { urls: [ 'hello@example.com', 'hello@example.com' ] },
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
@@ -102,7 +103,7 @@ describe('Test server follows API validators', function () {
           path,
           fields: { hosts: [ 'localhost:9002' ] },
           token: 'fake_token',
-          statusCodeExpected: 401
+          expectedStatus: HttpStatusCode.UNAUTHORIZED_401
         })
       })
 
@@ -112,7 +113,7 @@ describe('Test server follows API validators', function () {
           path,
           fields: { hosts: [ 'localhost:9002' ] },
           token: userAccessToken,
-          statusCodeExpected: 403
+          expectedStatus: HttpStatusCode.FORBIDDEN_403
         })
       })
     })
@@ -142,13 +143,24 @@ describe('Test server follows API validators', function () {
         })
       })
 
+      it('Should fail with an incorrect actor type', async function () {
+        await makeGetRequest({
+          url: server.url,
+          path,
+          query: {
+            actorType: 'blabla'
+          }
+        })
+      })
+
       it('Should fail succeed with the correct params', async function () {
         await makeGetRequest({
           url: server.url,
           path,
-          statusCodeExpected: 200,
+          expectedStatus: HttpStatusCode.OK_200,
           query: {
-            state: 'accepted'
+            state: 'accepted',
+            actorType: 'Application'
           }
         })
       })
@@ -169,12 +181,23 @@ describe('Test server follows API validators', function () {
         await checkBadSortPagination(server.url, path)
       })
 
+      it('Should fail with an incorrect actor type', async function () {
+        await makeGetRequest({
+          url: server.url,
+          path,
+          query: {
+            actorType: 'blabla'
+          }
+        })
+      })
+
       it('Should fail with an incorrect state', async function () {
         await makeGetRequest({
           url: server.url,
           path,
           query: {
-            state: 'blabla'
+            state: 'blabla',
+            actorType: 'Application'
           }
         })
       })
@@ -183,7 +206,7 @@ describe('Test server follows API validators', function () {
         await makeGetRequest({
           url: server.url,
           path,
-          statusCodeExpected: 200,
+          expectedStatus: HttpStatusCode.OK_200,
           query: {
             state: 'accepted'
           }
@@ -199,7 +222,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9002',
           token: 'fake_token',
-          statusCodeExpected: 401
+          expectedStatus: HttpStatusCode.UNAUTHORIZED_401
         })
       })
 
@@ -208,7 +231,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9002',
           token: userAccessToken,
-          statusCodeExpected: 403
+          expectedStatus: HttpStatusCode.FORBIDDEN_403
         })
       })
 
@@ -217,7 +240,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto',
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
@@ -226,7 +249,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9003',
           token: server.accessToken,
-          statusCodeExpected: 404
+          expectedStatus: HttpStatusCode.NOT_FOUND_404
         })
       })
     })
@@ -239,7 +262,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9002/accept',
           token: 'fake_token',
-          statusCodeExpected: 401
+          expectedStatus: HttpStatusCode.UNAUTHORIZED_401
         })
       })
 
@@ -248,7 +271,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9002/accept',
           token: userAccessToken,
-          statusCodeExpected: 403
+          expectedStatus: HttpStatusCode.FORBIDDEN_403
         })
       })
 
@@ -257,7 +280,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto/accept',
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
@@ -266,7 +289,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9003/accept',
           token: server.accessToken,
-          statusCodeExpected: 404
+          expectedStatus: HttpStatusCode.NOT_FOUND_404
         })
       })
     })
@@ -279,7 +302,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9002/reject',
           token: 'fake_token',
-          statusCodeExpected: 401
+          expectedStatus: HttpStatusCode.UNAUTHORIZED_401
         })
       })
 
@@ -288,7 +311,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9002/reject',
           token: userAccessToken,
-          statusCodeExpected: 403
+          expectedStatus: HttpStatusCode.FORBIDDEN_403
         })
       })
 
@@ -297,7 +320,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto/reject',
           token: server.accessToken,
-          statusCodeExpected: 400
+          expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
@@ -306,7 +329,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/toto@localhost:9003/reject',
           token: server.accessToken,
-          statusCodeExpected: 404
+          expectedStatus: HttpStatusCode.NOT_FOUND_404
         })
       })
     })
@@ -319,7 +342,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/localhost:9002',
           token: 'fake_token',
-          statusCodeExpected: 401
+          expectedStatus: HttpStatusCode.UNAUTHORIZED_401
         })
       })
 
@@ -328,7 +351,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/localhost:9002',
           token: userAccessToken,
-          statusCodeExpected: 403
+          expectedStatus: HttpStatusCode.FORBIDDEN_403
         })
       })
 
@@ -337,7 +360,7 @@ describe('Test server follows API validators', function () {
           url: server.url,
           path: path + '/example.com',
           token: server.accessToken,
-          statusCodeExpected: 404
+          expectedStatus: HttpStatusCode.NOT_FOUND_404
         })
       })
     })