From ab14f0e0dca878dbaccc8f6a895a68e4269c9873 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 4 May 2023 15:55:51 +0200 Subject: Prefer video studio instead of video edition Clearer and easier to find in the project --- server/tests/api/check-params/runners.ts | 10 +++++----- server/tests/api/runners/runner-studio-transcoding.ts | 10 +++++----- server/tests/api/transcoding/video-studio.ts | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'server/tests/api') diff --git a/server/tests/api/check-params/runners.ts b/server/tests/api/check-params/runners.ts index 90a301392..cee1993e6 100644 --- a/server/tests/api/check-params/runners.ts +++ b/server/tests/api/check-params/runners.ts @@ -8,7 +8,7 @@ import { RunnerJobState, RunnerJobSuccessPayload, RunnerJobUpdatePayload, - RunnerJobVideoEditionTranscodingPayload, + RunnerJobStudioTranscodingPayload, VideoPrivacy, VideoStudioTaskIntro } from '@shared/models' @@ -404,10 +404,10 @@ describe('Test managing runners', function () { tasks: VideoStudioCommand.getComplexTask() }) - const { job } = await server.runnerJobs.autoAccept({ runnerToken, type: 'video-edition-transcoding' }) + const { job } = await server.runnerJobs.autoAccept({ runnerToken, type: 'video-studio-transcoding' }) studioAcceptedJob = job - const tasks = (job.payload as RunnerJobVideoEditionTranscodingPayload).tasks + const tasks = (job.payload as RunnerJobStudioTranscodingPayload).tasks const fileUrl = (tasks.find(t => isVideoStudioTaskIntro(t)) as VideoStudioTaskIntro).options.file as string studioFile = basename(fileUrl) } @@ -787,7 +787,7 @@ describe('Test managing runners', function () { describe('Video studio', function () { - it('Should fail with an invalid video edition transcoding payload', async function () { + it('Should fail with an invalid video studio transcoding payload', async function () { await server.runnerJobs.success({ jobUUID: studioAcceptedJob.uuid, jobToken: studioAcceptedJob.jobToken, @@ -849,7 +849,7 @@ describe('Test managing runners', function () { }) }) - describe('Video edition tasks file routes', function () { + describe('Video studio tasks file routes', function () { it('Should fail with an invalid studio filename', async function () { await fetchStudioFiles({ diff --git a/server/tests/api/runners/runner-studio-transcoding.ts b/server/tests/api/runners/runner-studio-transcoding.ts index 9ae629be6..41c556775 100644 --- a/server/tests/api/runners/runner-studio-transcoding.ts +++ b/server/tests/api/runners/runner-studio-transcoding.ts @@ -5,8 +5,8 @@ import { readFile } from 'fs-extra' import { checkPersistentTmpIsEmpty, checkVideoDuration } from '@server/tests/shared' import { buildAbsoluteFixturePath } from '@shared/core-utils' import { - RunnerJobVideoEditionTranscodingPayload, - VideoEditionTranscodingSuccess, + RunnerJobStudioTranscodingPayload, + VideoStudioTranscodingSuccess, VideoState, VideoStudioTask, VideoStudioTaskIntro @@ -121,10 +121,10 @@ describe('Test runner video studio transcoding', function () { await checkVideoDuration(server, videoUUID, 5) } - const { job } = await servers[0].runnerJobs.accept({ runnerToken, jobUUID }) + const { job } = await servers[0].runnerJobs.accept({ runnerToken, jobUUID }) const jobToken = job.jobToken - expect(job.type === 'video-edition-transcoding') + expect(job.type === 'video-studio-transcoding') expect(job.payload.input.videoFileUrl).to.exist // Check video input file @@ -150,7 +150,7 @@ describe('Test runner video studio transcoding', function () { expect(body).to.deep.equal(inputFile) } - const payload: VideoEditionTranscodingSuccess = { videoFile: 'video_very_short_240p.mp4' } + const payload: VideoStudioTranscodingSuccess = { videoFile: 'video_very_short_240p.mp4' } await servers[0].runnerJobs.success({ runnerToken, jobUUID, jobToken, payload }) await waitJobs(servers) diff --git a/server/tests/api/transcoding/video-studio.ts b/server/tests/api/transcoding/video-studio.ts index 2f64ef6bd..d22cfff4a 100644 --- a/server/tests/api/transcoding/video-studio.ts +++ b/server/tests/api/transcoding/video-studio.ts @@ -270,7 +270,7 @@ describe('Test video studio', function () { }) }) - describe('HLS only video edition', function () { + describe('HLS only studio edition', function () { before(async function () { // Disable webtorrent @@ -300,7 +300,7 @@ describe('Test video studio', function () { }) }) - describe('Object storage video edition', function () { + describe('Object storage studio edition', function () { if (areMockObjectStorageTestsDisabled()) return before(async function () { -- cgit v1.2.3