X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fblocklist.ts;h=11a79387f5426fe11bf2e45d4faa42ae18cbcbb2;hb=41d1d075011174e73dccb74006181a92a618d7b4;hp=fb459f756f9ae59fd178aef64e3af2e3420588f2;hpb=4c1def5fd8e9f483238eb38e221f555e2e6bbf07;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts
index fb459f756..11a79387f 100644
--- a/server/tests/api/check-params/blocklist.ts
+++ b/server/tests/api/check-params/blocklist.ts
@@ -11,14 +11,14 @@ import {
   makeGetRequest,
   makePostBodyRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } 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[]
@@ -36,7 +36,7 @@ describe('Test blocklist API validators', 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.loginCommand.getAccessToken(user)
 
     await doubleFollow(servers[0], servers[1])
   })
@@ -53,7 +53,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -76,7 +76,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -86,7 +86,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -96,7 +96,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: 409
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -106,7 +106,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -116,7 +116,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -125,7 +125,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -134,7 +134,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -148,7 +148,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -171,17 +171,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
           })
         })
 
@@ -191,7 +191,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + server.port },
-            statusCodeExpected: 409
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -201,7 +201,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -211,16 +211,16 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
-            statusCodeExpected: 401
+            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
           })
         })
 
@@ -229,7 +229,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -246,7 +246,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -255,7 +255,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -278,7 +278,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -288,7 +288,7 @@ describe('Test blocklist API validators', function () {
             token: userAccessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -298,7 +298,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -308,7 +308,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: 409
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -318,7 +318,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -328,7 +328,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -337,7 +337,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: userAccessToken,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -346,7 +346,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: 404
+            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -355,7 +355,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -369,7 +369,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -378,7 +378,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: 403
+            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -401,7 +401,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -411,17 +411,17 @@ describe('Test blocklist API validators', function () {
             token: userAccessToken,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: 403
+            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
           })
         })
 
@@ -431,7 +431,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + server.port },
-            statusCodeExpected: 409
+            statusCodeExpected: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -441,7 +441,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -451,7 +451,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
-            statusCodeExpected: 401
+            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -460,16 +460,16 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             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
           })
         })
 
@@ -478,7 +478,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
             token: server.accessToken,
-            statusCodeExpected: 204
+            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
           })
         })
       })