X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Ffollows.ts;h=2c2224a452b848a972362b6d06505b76ee78ec47;hb=77e9f859c6ad75ba179dec74e5410cc651eaa49b;hp=0af1562f5b39d7c7eb829fb150a8a2cdaa7787f9;hpb=0f91ae62df8a37194fea84ce1efa9e733d9c1fd8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts
index 0af1562f5..2c2224a45 100644
--- a/server/tests/api/check-params/follows.ts
+++ b/server/tests/api/check-params/follows.ts
@@ -1,17 +1,22 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-import * as request from 'supertest'
 
 import {
+  cleanupTests,
   createUser,
-  flushTests,
-  killallServers,
-  loginAndGetAccessToken,
-  runServer,
+  flushAndRunServer,
+  makeDeleteRequest, makeGetRequest,
+  makePostBodyRequest,
   ServerInfo,
-  setAccessTokensToServers
-} from '../../utils'
+  setAccessTokensToServers,
+  userLogin
+} from '../../../../shared/extra-utils'
+import {
+  checkBadCountPagination,
+  checkBadSortPagination,
+  checkBadStartPagination
+} from '../../../../shared/extra-utils/requests/check-api-params'
 
 describe('Test server follows API validators', function () {
   let server: ServerInfo
@@ -19,10 +24,9 @@ describe('Test server follows API validators', function () {
   // ---------------------------------------------------------------
 
   before(async function () {
-    this.timeout(45000)
+    this.timeout(30000)
 
-    await flushTests()
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
 
     await setAccessTokensToServers([ server ])
   })
@@ -31,81 +35,85 @@ describe('Test server follows API validators', function () {
     let userAccessToken = null
 
     before(async function () {
-      await createUser(server.url, server.accessToken, 'user1', 'password')
-      server.user = {
+      const user = {
         username: 'user1',
         password: 'password'
       }
 
-      userAccessToken = await loginAndGetAccessToken(server)
+      await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
+      userAccessToken = await userLogin(server, user)
     })
 
     describe('When adding follows', function () {
       const path = '/api/v1/server/following'
-      const body = {
-        hosts: [ 'localhost:9002' ]
-      }
 
       it('Should fail without hosts', async function () {
-        await request(server.url)
-                .post(path)
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
       })
 
       it('Should fail if hosts is not an array', async function () {
-        await request(server.url)
-                .post(path)
-                .send({ hosts: 'localhost:9002' })
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          token: server.accessToken,
+          fields: { hosts: 'localhost:9002' },
+          statusCodeExpected: 400
+        })
       })
 
       it('Should fail if the array is not composed by hosts', async function () {
-        await request(server.url)
-                .post(path)
-                .send({ hosts: [ 'localhost:9002', 'localhost:coucou' ] })
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          fields: { hosts: [ 'localhost:9002', 'localhost:coucou' ] },
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
       })
 
       it('Should fail if the array is composed with http schemes', async function () {
-        await request(server.url)
-                .post(path)
-                .send({ hosts: [ 'localhost:9002', 'http://localhost:9003' ] })
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          fields: { hosts: [ 'localhost:9002', 'http://localhost:9003' ] },
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
       })
 
       it('Should fail if hosts are not unique', async function () {
-        await request(server.url)
-                .post(path)
-                .send({ urls: [ 'localhost:9002', 'localhost:9002' ] })
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          fields: { urls: [ 'localhost:9002', 'localhost:9002' ] },
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
       })
 
       it('Should fail with an invalid token', async function () {
-        await request(server.url)
-                .post(path)
-                .send(body)
-                .set('Authorization', 'Bearer fake_token')
-                .set('Accept', 'application/json')
-                .expect(401)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          fields: { hosts: [ 'localhost:9002' ] },
+          token: 'fake_token',
+          statusCodeExpected: 401
+        })
       })
 
       it('Should fail if the user is not an administrator', async function () {
-        await request(server.url)
-                .post(path)
-                .send(body)
-                .set('Authorization', 'Bearer ' + userAccessToken)
-                .set('Accept', 'application/json')
-                .expect(403)
+        await makePostBodyRequest({
+          url: server.url,
+          path,
+          fields: { hosts: [ 'localhost:9002' ] },
+          token: userAccessToken,
+          statusCodeExpected: 403
+        })
       })
     })
 
@@ -113,27 +121,47 @@ describe('Test server follows API validators', function () {
       const path = '/api/v1/server/following'
 
       it('Should fail with a bad start pagination', async function () {
-        await request(server.url)
-          .get(path)
-          .query({ start: 'hello' })
-          .set('Accept', 'application/json')
-          .expect(400)
+        await checkBadStartPagination(server.url, path)
       })
 
       it('Should fail with a bad count pagination', async function () {
-        await request(server.url)
-          .get(path)
-          .query({ count: 'hello' })
-          .set('Accept', 'application/json')
-          .expect(400)
+        await checkBadCountPagination(server.url, path)
       })
 
       it('Should fail with an incorrect sort', async function () {
-        await request(server.url)
-          .get(path)
-          .query({ sort: 'hello' })
-          .set('Accept', 'application/json')
-          .expect(400)
+        await checkBadSortPagination(server.url, path)
+      })
+
+      it('Should fail with an incorrect state', async function () {
+        await makeGetRequest({
+          url: server.url,
+          path,
+          query: {
+            state: 'blabla'
+          }
+        })
+      })
+
+      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,
+          query: {
+            state: 'accepted',
+            actorType: 'Application'
+          }
+        })
       })
     })
 
@@ -141,83 +169,203 @@ describe('Test server follows API validators', function () {
       const path = '/api/v1/server/followers'
 
       it('Should fail with a bad start pagination', async function () {
-        await request(server.url)
-          .get(path)
-          .query({ start: 'hello' })
-          .set('Accept', 'application/json')
-          .expect(400)
+        await checkBadStartPagination(server.url, path)
       })
 
       it('Should fail with a bad count pagination', async function () {
-        await request(server.url)
-          .get(path)
-          .query({ count: 'hello' })
-          .set('Accept', 'application/json')
-          .expect(400)
+        await checkBadCountPagination(server.url, path)
       })
 
       it('Should fail with an incorrect sort', async function () {
-        await request(server.url)
-          .get(path)
-          .query({ sort: 'hello' })
-          .set('Accept', 'application/json')
-          .expect(400)
+        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',
+            actorType: 'Application'
+          }
+        })
+      })
+
+      it('Should fail succeed with the correct params', async function () {
+        await makeGetRequest({
+          url: server.url,
+          path,
+          statusCodeExpected: 200,
+          query: {
+            state: 'accepted'
+          }
+        })
       })
     })
 
-    describe('When removing following', function () {
-      const path = '/api/v1/server/following'
+    describe('When removing a follower', function () {
+      const path = '/api/v1/server/followers'
 
       it('Should fail with an invalid token', async function () {
-      	await request(server.url)
-                .delete(path + '/1')
-                .set('Authorization', 'Bearer faketoken')
-                .set('Accept', 'application/json')
-                .expect(401)
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9002',
+          token: 'fake_token',
+          statusCodeExpected: 401
+        })
       })
 
       it('Should fail if the user is not an administrator', async function () {
-      	await request(server.url)
-                .delete(path + '/1')
-                .set('Authorization', 'Bearer ' + userAccessToken)
-                .set('Accept', 'application/json')
-                .expect(403)
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9002',
+          token: userAccessToken,
+          statusCodeExpected: 403
+        })
       })
 
-      it('Should fail with an undefined id', async function () {
-        await request(server.url)
-                .delete(path + '/' + undefined)
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+      it('Should fail with an invalid follower', async function () {
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/toto',
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
       })
 
-      it('Should fail with an invalid id', async function () {
-	      await request(server.url)
-                .delete(path + '/foobar')
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(400)
+      it('Should fail with an unknown follower', async function () {
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9003',
+          token: server.accessToken,
+          statusCodeExpected: 404
+        })
       })
+    })
 
-      it('Should fail we do not follow this server', async function () {
-	      await request(server.url)
-                .delete(path + '/-1')
-                .set('Authorization', 'Bearer ' + server.accessToken)
-                .set('Accept', 'application/json')
-                .expect(404)
+    describe('When accepting a follower', function () {
+      const path = '/api/v1/server/followers'
+
+      it('Should fail with an invalid token', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9002/accept',
+          token: 'fake_token',
+          statusCodeExpected: 401
+        })
       })
 
-      it('Should succeed with the correct parameters')
+      it('Should fail if the user is not an administrator', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9002/accept',
+          token: userAccessToken,
+          statusCodeExpected: 403
+        })
+      })
+
+      it('Should fail with an invalid follower', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto/accept',
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
+      })
+
+      it('Should fail with an unknown follower', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9003/accept',
+          token: server.accessToken,
+          statusCodeExpected: 404
+        })
+      })
+    })
+
+    describe('When rejecting a follower', function () {
+      const path = '/api/v1/server/followers'
+
+      it('Should fail with an invalid token', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9002/reject',
+          token: 'fake_token',
+          statusCodeExpected: 401
+        })
+      })
+
+      it('Should fail if the user is not an administrator', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9002/reject',
+          token: userAccessToken,
+          statusCodeExpected: 403
+        })
+      })
+
+      it('Should fail with an invalid follower', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto/reject',
+          token: server.accessToken,
+          statusCodeExpected: 400
+        })
+      })
+
+      it('Should fail with an unknown follower', async function () {
+        await makePostBodyRequest({
+          url: server.url,
+          path: path + '/toto@localhost:9003/reject',
+          token: server.accessToken,
+          statusCodeExpected: 404
+        })
+      })
+    })
+
+    describe('When removing following', function () {
+      const path = '/api/v1/server/following'
+
+      it('Should fail with an invalid token', async function () {
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/localhost:9002',
+          token: 'fake_token',
+          statusCodeExpected: 401
+        })
+      })
+
+      it('Should fail if the user is not an administrator', async function () {
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/localhost:9002',
+          token: userAccessToken,
+          statusCodeExpected: 403
+        })
+      })
+
+      it('Should fail if we do not follow this server', async function () {
+        await makeDeleteRequest({
+          url: server.url,
+          path: path + '/example.com',
+          token: server.accessToken,
+          statusCodeExpected: 404
+        })
+      })
     })
   })
 
   after(async function () {
-    killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests([ server ])
   })
 })