X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fblocklist.ts;h=169b591a35670b2b14d7d36fdfd54db8aa850d53;hb=2732eeff9e6994582293b5aaa0cb158b7e272e9e;hp=c745ac975f04d4d1bc2bf2aded538d4e55ad10e6;hpb=be0f59b4eec3c2c4dcd151e2b174be39dff1568e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts
index c745ac975..169b591a3 100644
--- a/server/tests/api/check-params/blocklist.ts
+++ b/server/tests/api/check-params/blocklist.ts
@@ -1,40 +1,35 @@
-/* tslint:disable:no-unused-expression */
-
-import 'mocha'
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
+import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '@server/tests/shared'
+import { HttpStatusCode } from '@shared/models'
 import {
-  createUser,
+  cleanupTests,
+  createMultipleServers,
   doubleFollow,
-  flushAndRunMultipleServers,
-  flushTests,
-  killallServers,
   makeDeleteRequest,
   makeGetRequest,
   makePostBodyRequest,
-  ServerInfo,
-  setAccessTokensToServers, userLogin
-} from '../../utils'
-import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
+  PeerTubeServer,
+  setAccessTokensToServers
+} from '@shared/server-commands'
 
 describe('Test blocklist API validators', function () {
-  let servers: ServerInfo[]
-  let server: ServerInfo
+  let servers: PeerTubeServer[]
+  let server: PeerTubeServer
   let userAccessToken: string
 
   before(async function () {
     this.timeout(60000)
 
-    await flushTests()
-
-    servers = await flushAndRunMultipleServers(2)
+    servers = await createMultipleServers(2)
     await setAccessTokensToServers(servers)
 
     server = servers[0]
 
     const user = { username: 'user1', password: 'password' }
-    await createUser(server.url, server.accessToken, user.username, user.password)
+    await server.users.create({ username: user.username, password: user.password })
 
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.login.getAccessToken(user)
 
     await doubleFollow(servers[0], servers[1])
   })
@@ -51,7 +46,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -74,7 +69,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -84,7 +79,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: 404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -94,7 +89,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: 409
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -104,7 +99,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -114,7 +109,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -123,7 +118,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: 404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -132,7 +127,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: 204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -146,7 +141,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -168,18 +163,18 @@ describe('Test blocklist API validators', function () {
           await makePostBodyRequest({
             url: server.url,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 401
+            fields: { host: '127.0.0.1:9002' },
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
-        it('Should fail with an unknown server', async function () {
+        it('Should succeed with an unknown server', async function () {
           await makePostBodyRequest({
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9003' },
-            statusCodeExpected: 404
+            fields: { host: '127.0.0.1:9003' },
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
 
@@ -188,8 +183,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9001' },
-            statusCodeExpected: 409
+            fields: { host: server.host },
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -198,8 +193,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 204
+            fields: { host: servers[1].host },
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -208,26 +203,26 @@ describe('Test blocklist API validators', function () {
         it('Should fail with an unauthenticated user', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
-            statusCodeExpected: 401
+            path: path + '/' + servers[1].host,
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
         it('Should fail with an unknown server block', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9003',
+            path: path + '/127.0.0.1:9004',
             token: server.accessToken,
-            statusCodeExpected: 404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
         it('Should succeed with the correct params', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
+            path: path + '/' + servers[1].host,
             token: server.accessToken,
-            statusCodeExpected: 204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -244,7 +239,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -253,7 +248,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: 403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -276,7 +271,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -286,7 +281,7 @@ describe('Test blocklist API validators', function () {
             token: userAccessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -296,7 +291,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: 404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -306,7 +301,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: 409
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -316,7 +311,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -326,7 +321,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -335,7 +330,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: userAccessToken,
-            statusCodeExpected: 403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -344,7 +339,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: 404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -353,7 +348,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: 204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -367,7 +362,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -376,7 +371,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: 403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -398,8 +393,8 @@ describe('Test blocklist API validators', function () {
           await makePostBodyRequest({
             url: server.url,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 401
+            fields: { host: servers[1].host },
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -408,18 +403,18 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 403
+            fields: { host: servers[1].host },
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
-        it('Should fail with an unknown server', async function () {
+        it('Should succeed with an unknown server', async function () {
           await makePostBodyRequest({
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9003' },
-            statusCodeExpected: 404
+            fields: { host: '127.0.0.1:9003' },
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
 
@@ -428,8 +423,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9001' },
-            statusCodeExpected: 409
+            fields: { host: server.host },
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -438,8 +433,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 204
+            fields: { host: servers[1].host },
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -448,47 +443,114 @@ describe('Test blocklist API validators', function () {
         it('Should fail with an unauthenticated user', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
-            statusCodeExpected: 401
+            path: path + '/' + servers[1].host,
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
         it('Should fail with a user without the appropriate rights', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
+            path: path + '/' + servers[1].host,
             token: userAccessToken,
-            statusCodeExpected: 403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
         it('Should fail with an unknown server block', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9003',
+            path: path + '/127.0.0.1:9004',
             token: server.accessToken,
-            statusCodeExpected: 404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
         it('Should succeed with the correct params', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
+            path: path + '/' + servers[1].host,
             token: server.accessToken,
-            statusCodeExpected: 204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
     })
   })
 
-  after(async function () {
-    killallServers(servers)
+  describe('When getting blocklist status', function () {
+    const path = '/api/v1/blocklist/status'
+
+    it('Should fail with a bad token', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        token: 'false',
+        expectedStatus: HttpStatusCode.UNAUTHORIZED_401
+      })
+    })
 
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    it('Should fail with a bad accounts field', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          accounts: 1
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          accounts: [ 1 ]
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+    })
+
+    it('Should fail with a bad hosts field', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          hosts: 1
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          hosts: [ 1 ]
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+    })
+
+    it('Should succeed with the correct parameters', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {},
+        expectedStatus: HttpStatusCode.OK_200
+      })
+
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          hosts: [ 'example.com' ],
+          accounts: [ 'john@example.com' ]
+        },
+        expectedStatus: HttpStatusCode.OK_200
+      })
+    })
+  })
+
+  after(async function () {
+    await cleanupTests(servers)
   })
 })