1 files changed, 24 insertions, 23 deletions

diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts
index 2f049c03d..c0595c04d 100644
--- a/server/tests/api/check-params/video-captions.ts
+++ b/server/tests/api/check-params/video-captions.ts
@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
+import { VideoCreateResult } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
   cleanupTests,
   createUser,
   flushAndRunServer,
@@ -13,16 +16,14 @@ import {
   uploadVideo,
   userLogin
 } from '../../../../shared/extra-utils'
-import { join } from 'path'
 import { createVideoCaption } from '../../../../shared/extra-utils/videos/video-captions'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 describe('Test video captions API validator', function () {
   const path = '/api/v1/videos/'
 
   let server: ServerInfo
   let userAccessToken: string
-  let videoUUID: string
+  let video: VideoCreateResult
 
   // ---------------------------------------------------------------
 
@@ -35,7 +36,7 @@ describe('Test video captions API validator', function () {
 
     {
       const res = await uploadVideo(server.url, server.accessToken, {})
-      videoUUID = res.body.video.uuid
+      video = res.body.video
     }
 
     {
@@ -51,7 +52,7 @@ describe('Test video captions API validator', function () {
   describe('When adding video caption', function () {
     const fields = { }
     const attaches = {
-      captionfile: join(__dirname, '..', '..', 'fixtures', 'subtitle-good1.vtt')
+      captionfile: buildAbsoluteFixturePath('subtitle-good1.vtt')
     }
 
     it('Should fail without a valid uuid', async function () {
@@ -78,7 +79,7 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should fail with a missing language in path', async function () {
-      const captionPath = path + videoUUID + '/captions'
+      const captionPath = path + video.uuid + '/captions'
       await makeUploadRequest({
         method: 'PUT',
         url: server.url,
@@ -90,7 +91,7 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should fail with an unknown language', async function () {
-      const captionPath = path + videoUUID + '/captions/15'
+      const captionPath = path + video.uuid + '/captions/15'
       await makeUploadRequest({
         method: 'PUT',
         url: server.url,
@@ -102,7 +103,7 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should fail without access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.uuid + '/captions/fr'
       await makeUploadRequest({
         method: 'PUT',
         url: server.url,
@@ -114,7 +115,7 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should fail with a bad access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.uuid + '/captions/fr'
       await makeUploadRequest({
         method: 'PUT',
         url: server.url,
@@ -129,10 +130,10 @@ describe('Test video captions API validator', function () {
     // We accept any file now
     // it('Should fail with an invalid captionfile extension', async function () {
     //   const attaches = {
-    //     'captionfile': join(__dirname, '..', '..', 'fixtures', 'subtitle-bad.txt')
+    //     'captionfile': buildAbsoluteFixturePath('subtitle-bad.txt')
     //   }
     //
-    //   const captionPath = path + videoUUID + '/captions/fr'
+    //   const captionPath = path + video.uuid + '/captions/fr'
     //   await makeUploadRequest({
     //     method: 'PUT',
     //     url: server.url,
@@ -150,7 +151,7 @@ describe('Test video captions API validator', function () {
     //     url: server.url,
     //     accessToken: server.accessToken,
     //     language: 'zh',
-    //     videoId: videoUUID,
+    //     videoId: video.uuid,
     //     fixture: 'subtitle-bad.txt',
     //     mimeType: 'application/octet-stream',
     //     statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
@@ -162,7 +163,7 @@ describe('Test video captions API validator', function () {
         url: server.url,
         accessToken: server.accessToken,
         language: 'zh',
-        videoId: videoUUID,
+        videoId: video.uuid,
         fixture: 'subtitle-good.srt',
         mimeType: 'application/octet-stream'
       })
@@ -171,10 +172,10 @@ describe('Test video captions API validator', function () {
     // We don't check the file validity yet
     // it('Should fail with an invalid captionfile srt', async function () {
     //   const attaches = {
-    //     'captionfile': join(__dirname, '..', '..', 'fixtures', 'subtitle-bad.srt')
+    //     'captionfile': buildAbsoluteFixturePath('subtitle-bad.srt')
     //   }
     //
-    //   const captionPath = path + videoUUID + '/captions/fr'
+    //   const captionPath = path + video.uuid + '/captions/fr'
     //   await makeUploadRequest({
     //     method: 'PUT',
     //     url: server.url,
@@ -187,7 +188,7 @@ describe('Test video captions API validator', function () {
     // })
 
     it('Should success with the correct parameters', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.uuid + '/captions/fr'
       await makeUploadRequest({
         method: 'PUT',
         url: server.url,
@@ -214,7 +215,7 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should success with the correct parameters', async function () {
-      await makeGetRequest({ url: server.url, path: path + videoUUID + '/captions', statusCodeExpected: HttpStatusCode.OK_200 })
+      await makeGetRequest({ url: server.url, path: path + video.shortUUID + '/captions', statusCodeExpected: HttpStatusCode.OK_200 })
     })
   })
 
@@ -245,27 +246,27 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should fail with a missing language', async function () {
-      const captionPath = path + videoUUID + '/captions'
+      const captionPath = path + video.shortUUID + '/captions'
       await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken })
     })
 
     it('Should fail with an unknown language', async function () {
-      const captionPath = path + videoUUID + '/captions/15'
+      const captionPath = path + video.shortUUID + '/captions/15'
       await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken })
     })
 
     it('Should fail without access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
       await makeDeleteRequest({ url: server.url, path: captionPath, statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401 })
     })
 
     it('Should fail with a bad access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
       await makeDeleteRequest({ url: server.url, path: captionPath, token: 'coucou', statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401 })
     })
 
     it('Should fail with another user', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
       await makeDeleteRequest({
         url: server.url,
         path: captionPath,
@@ -275,7 +276,7 @@ describe('Test video captions API validator', function () {
     })
 
     it('Should success with the correct parameters', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
       await makeDeleteRequest({
         url: server.url,
         path: captionPath,