X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fvideo-channels.ts;h=d29346dc3f048c14654270754fef8c89cb518d53;hb=a54618880c394ad7571f3f3222dc96ec2dd10d9a;hp=bc2e6192eb6fefb836c8f90966e9bea30bbab7b3;hpb=4024c44f9027a32809931de0692d40d001df721c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index bc2e6192e..d29346dc3 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -1,14 +1,15 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
+import 'mocha'
 import * as chai from 'chai'
 import { omit } from 'lodash'
-import 'mocha'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
+  ChannelsCommand,
   cleanupTests,
   createUser,
-  deleteVideoChannel,
   flushAndRunServer,
-  getAccountVideoChannelsList,
   immutableAssign,
   makeGetRequest,
   makePostBodyRequest,
@@ -23,9 +24,7 @@ import {
   checkBadSortPagination,
   checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
-import { join } from 'path'
 import { VideoChannelUpdate } from '../../../../shared/models/videos'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 const expect = chai.expect
 
@@ -33,6 +32,7 @@ describe('Test video channels API validator', function () {
   const videoChannelPath = '/api/v1/video-channels'
   let server: ServerInfo
   let accessTokenUser: string
+  let command: ChannelsCommand
 
   // ---------------------------------------------------------------
 
@@ -52,6 +52,8 @@ describe('Test video channels API validator', function () {
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
       accessTokenUser = await userLogin(server, user)
     }
+
+    command = server.channelsCommand
   })
 
   describe('When listing a video channels', function () {
@@ -84,7 +86,7 @@ describe('Test video channels API validator', function () {
     })
 
     it('Should fail with a unknown account', async function () {
-      await getAccountVideoChannelsList({ url: server.url, accountName: 'unknown', specialStatus: HttpStatusCode.NOT_FOUND_404 })
+      await server.channelsCommand.listByAccount({ accountName: 'unknown', expectedStatus: HttpStatusCode.NOT_FOUND_404 })
     })
 
     it('Should succeed with the correct parameters', async function () {
@@ -246,7 +248,7 @@ describe('Test video channels API validator', function () {
       for (const type of types) {
         const fields = {}
         const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+          [type + 'file']: buildAbsoluteFixturePath('video_short.mp4')
         }
 
         await makeUploadRequest({ url: server.url, path: `${path}/${type}/pick`, token: server.accessToken, fields, attaches })
@@ -257,7 +259,7 @@ describe('Test video channels API validator', function () {
       for (const type of types) {
         const fields = {}
         const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'avatar-big.png')
+          [type + 'file']: buildAbsoluteFixturePath('avatar-big.png')
         }
         await makeUploadRequest({ url: server.url, path: `${path}/${type}/pick`, token: server.accessToken, fields, attaches })
       }
@@ -267,7 +269,7 @@ describe('Test video channels API validator', function () {
       for (const type of types) {
         const fields = {}
         const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'avatar.png')
+          [type + 'file']: buildAbsoluteFixturePath('avatar.png')
         }
         await makeUploadRequest({
           url: server.url,
@@ -283,7 +285,7 @@ describe('Test video channels API validator', function () {
       for (const type of types) {
         const fields = {}
         const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'avatar.png')
+          [type + 'file']: buildAbsoluteFixturePath('avatar.png')
         }
         await makeUploadRequest({
           url: server.url,
@@ -327,23 +329,23 @@ describe('Test video channels API validator', function () {
 
   describe('When deleting a video channel', function () {
     it('Should fail with a non authenticated user', async function () {
-      await deleteVideoChannel(server.url, 'coucou', 'super_channel', HttpStatusCode.UNAUTHORIZED_401)
+      await command.delete({ token: 'coucou', channelName: 'super_channel', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
     })
 
     it('Should fail with another authenticated user', async function () {
-      await deleteVideoChannel(server.url, accessTokenUser, 'super_channel', HttpStatusCode.FORBIDDEN_403)
+      await command.delete({ token: accessTokenUser, channelName: 'super_channel', expectedStatus: HttpStatusCode.FORBIDDEN_403 })
     })
 
     it('Should fail with an unknown video channel id', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, 'super_channel2', HttpStatusCode.NOT_FOUND_404)
+      await command.delete({ channelName: 'super_channel2', expectedStatus: HttpStatusCode.NOT_FOUND_404 })
     })
 
     it('Should succeed with the correct parameters', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, 'super_channel')
+      await command.delete({ channelName: 'super_channel' })
     })
 
     it('Should fail to delete the last user video channel', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, 'root_channel', HttpStatusCode.CONFLICT_409)
+      await command.delete({ channelName: 'root_channel', expectedStatus: HttpStatusCode.CONFLICT_409 })
     })
   })