X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fblocklist.ts;h=5ed8810ced05c1f2efbcf92c60e082b87f6a565b;hb=a54618880c394ad7571f3f3222dc96ec2dd10d9a;hp=c745ac975f04d4d1bc2bf2aded538d4e55ad10e6;hpb=6d8c8ea73a774c3568e6d28a4cbebcf7979d5c2a;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..5ed8810ce 100644
--- a/server/tests/api/check-params/blocklist.ts
+++ b/server/tests/api/check-params/blocklist.ts
@@ -1,20 +1,25 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
 
 import {
+  cleanupTests,
   createUser,
   doubleFollow,
   flushAndRunMultipleServers,
-  flushTests,
-  killallServers,
   makeDeleteRequest,
   makeGetRequest,
   makePostBodyRequest,
   ServerInfo,
-  setAccessTokensToServers, userLogin
-} from '../../utils'
-import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
+  setAccessTokensToServers,
+  userLogin
+} from '../../../../shared/extra-utils'
+import {
+  checkBadCountPagination,
+  checkBadSortPagination,
+  checkBadStartPagination
+} from '../../../../shared/extra-utils/requests/check-api-params'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 describe('Test blocklist API validators', function () {
   let servers: ServerInfo[]
@@ -24,15 +29,13 @@ describe('Test blocklist API validators', function () {
   before(async function () {
     this.timeout(60000)
 
-    await flushTests()
-
     servers = await flushAndRunMultipleServers(2)
     await setAccessTokensToServers(servers)
 
     server = servers[0]
 
     const user = { username: 'user1', password: 'password' }
-    await createUser(server.url, server.accessToken, user.username, user.password)
+    await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
     userAccessToken = await userLogin(server, user)
 
@@ -51,7 +54,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -74,7 +77,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -84,7 +87,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -94,7 +97,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: 409
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -104,7 +107,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -114,7 +117,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -123,7 +126,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -132,7 +135,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -146,7 +149,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -169,17 +172,17 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { host: 'localhost:9002' },
-            statusCodeExpected: 401
+            statusCodeExpected: 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
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
 
@@ -188,8 +191,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9001' },
-            statusCodeExpected: 409
+            fields: { host: 'localhost:' + server.port },
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -198,8 +201,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 204
+            fields: { host: 'localhost:' + servers[1].port },
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -208,26 +211,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 + '/localhost:' + servers[1].port,
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
         it('Should fail with an unknown server block', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9003',
+            path: path + '/localhost:9004',
             token: server.accessToken,
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
         it('Should succeed with the correct params', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
+            path: path + '/localhost:' + servers[1].port,
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -244,7 +247,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -253,7 +256,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -276,7 +279,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -286,7 +289,7 @@ describe('Test blocklist API validators', function () {
             token: userAccessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -296,7 +299,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -306,7 +309,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: 409
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -316,7 +319,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -326,7 +329,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -335,7 +338,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: userAccessToken,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -344,7 +347,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -353,7 +356,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -367,7 +370,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -376,7 +379,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -398,8 +401,8 @@ describe('Test blocklist API validators', function () {
           await makePostBodyRequest({
             url: server.url,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 401
+            fields: { host: 'localhost:' + servers[1].port },
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -408,18 +411,18 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 403
+            fields: { host: 'localhost:' + servers[1].port },
+            statusCodeExpected: 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
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
 
@@ -428,8 +431,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9001' },
-            statusCodeExpected: 409
+            fields: { host: 'localhost:' + server.port },
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -438,8 +441,8 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: server.accessToken,
             path,
-            fields: { host: 'localhost:9002' },
-            statusCodeExpected: 204
+            fields: { host: 'localhost:' + servers[1].port },
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -448,35 +451,35 @@ 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 + '/localhost:' + servers[1].port,
+            statusCodeExpected: 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 + '/localhost:' + servers[1].port,
             token: userAccessToken,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
         it('Should fail with an unknown server block', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9003',
+            path: path + '/localhost:9004',
             token: server.accessToken,
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
         it('Should succeed with the correct params', async function () {
           await makeDeleteRequest({
             url: server.url,
-            path: path + '/localhost:9002',
+            path: path + '/localhost:' + servers[1].port,
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -484,11 +487,6 @@ describe('Test blocklist API validators', function () {
   })
 
   after(async function () {
-    killallServers(servers)
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests(servers)
   })
 })