aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-04 15:55:51 +0200
committerChocobozzz <chocobozzz@cpy.re>2023-05-09 08:57:34 +0200
commitab14f0e0dca878dbaccc8f6a895a68e4269c9873 (patch)
tree078247f8620ee1f3260b8c3e3336059863273eb8 /server/tests
parent5e47f6ab984a7d00782e4c7030afffa1ba480add (diff)
downloadPeerTube-ab14f0e0dca878dbaccc8f6a895a68e4269c9873.tar.gz
PeerTube-ab14f0e0dca878dbaccc8f6a895a68e4269c9873.tar.zst
PeerTube-ab14f0e0dca878dbaccc8f6a895a68e4269c9873.zip
Prefer video studio instead of video edition
Clearer and easier to find in the project
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/check-params/runners.ts10
-rw-r--r--server/tests/api/runners/runner-studio-transcoding.ts10
-rw-r--r--server/tests/api/transcoding/video-studio.ts4
3 files changed, 12 insertions, 12 deletions
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 {
8 RunnerJobState, 8 RunnerJobState,
9 RunnerJobSuccessPayload, 9 RunnerJobSuccessPayload,
10 RunnerJobUpdatePayload, 10 RunnerJobUpdatePayload,
11 RunnerJobVideoEditionTranscodingPayload, 11 RunnerJobStudioTranscodingPayload,
12 VideoPrivacy, 12 VideoPrivacy,
13 VideoStudioTaskIntro 13 VideoStudioTaskIntro
14} from '@shared/models' 14} from '@shared/models'
@@ -404,10 +404,10 @@ describe('Test managing runners', function () {
404 tasks: VideoStudioCommand.getComplexTask() 404 tasks: VideoStudioCommand.getComplexTask()
405 }) 405 })
406 406
407 const { job } = await server.runnerJobs.autoAccept({ runnerToken, type: 'video-edition-transcoding' }) 407 const { job } = await server.runnerJobs.autoAccept({ runnerToken, type: 'video-studio-transcoding' })
408 studioAcceptedJob = job 408 studioAcceptedJob = job
409 409
410 const tasks = (job.payload as RunnerJobVideoEditionTranscodingPayload).tasks 410 const tasks = (job.payload as RunnerJobStudioTranscodingPayload).tasks
411 const fileUrl = (tasks.find(t => isVideoStudioTaskIntro(t)) as VideoStudioTaskIntro).options.file as string 411 const fileUrl = (tasks.find(t => isVideoStudioTaskIntro(t)) as VideoStudioTaskIntro).options.file as string
412 studioFile = basename(fileUrl) 412 studioFile = basename(fileUrl)
413 } 413 }
@@ -787,7 +787,7 @@ describe('Test managing runners', function () {
787 787
788 describe('Video studio', function () { 788 describe('Video studio', function () {
789 789
790 it('Should fail with an invalid video edition transcoding payload', async function () { 790 it('Should fail with an invalid video studio transcoding payload', async function () {
791 await server.runnerJobs.success({ 791 await server.runnerJobs.success({
792 jobUUID: studioAcceptedJob.uuid, 792 jobUUID: studioAcceptedJob.uuid,
793 jobToken: studioAcceptedJob.jobToken, 793 jobToken: studioAcceptedJob.jobToken,
@@ -849,7 +849,7 @@ describe('Test managing runners', function () {
849 }) 849 })
850 }) 850 })
851 851
852 describe('Video edition tasks file routes', function () { 852 describe('Video studio tasks file routes', function () {
853 853
854 it('Should fail with an invalid studio filename', async function () { 854 it('Should fail with an invalid studio filename', async function () {
855 await fetchStudioFiles({ 855 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'
5import { checkPersistentTmpIsEmpty, checkVideoDuration } from '@server/tests/shared' 5import { checkPersistentTmpIsEmpty, checkVideoDuration } from '@server/tests/shared'
6import { buildAbsoluteFixturePath } from '@shared/core-utils' 6import { buildAbsoluteFixturePath } from '@shared/core-utils'
7import { 7import {
8 RunnerJobVideoEditionTranscodingPayload, 8 RunnerJobStudioTranscodingPayload,
9 VideoEditionTranscodingSuccess, 9 VideoStudioTranscodingSuccess,
10 VideoState, 10 VideoState,
11 VideoStudioTask, 11 VideoStudioTask,
12 VideoStudioTaskIntro 12 VideoStudioTaskIntro
@@ -121,10 +121,10 @@ describe('Test runner video studio transcoding', function () {
121 await checkVideoDuration(server, videoUUID, 5) 121 await checkVideoDuration(server, videoUUID, 5)
122 } 122 }
123 123
124 const { job } = await servers[0].runnerJobs.accept<RunnerJobVideoEditionTranscodingPayload>({ runnerToken, jobUUID }) 124 const { job } = await servers[0].runnerJobs.accept<RunnerJobStudioTranscodingPayload>({ runnerToken, jobUUID })
125 const jobToken = job.jobToken 125 const jobToken = job.jobToken
126 126
127 expect(job.type === 'video-edition-transcoding') 127 expect(job.type === 'video-studio-transcoding')
128 expect(job.payload.input.videoFileUrl).to.exist 128 expect(job.payload.input.videoFileUrl).to.exist
129 129
130 // Check video input file 130 // Check video input file
@@ -150,7 +150,7 @@ describe('Test runner video studio transcoding', function () {
150 expect(body).to.deep.equal(inputFile) 150 expect(body).to.deep.equal(inputFile)
151 } 151 }
152 152
153 const payload: VideoEditionTranscodingSuccess = { videoFile: 'video_very_short_240p.mp4' } 153 const payload: VideoStudioTranscodingSuccess = { videoFile: 'video_very_short_240p.mp4' }
154 await servers[0].runnerJobs.success({ runnerToken, jobUUID, jobToken, payload }) 154 await servers[0].runnerJobs.success({ runnerToken, jobUUID, jobToken, payload })
155 155
156 await waitJobs(servers) 156 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 () {
270 }) 270 })
271 }) 271 })
272 272
273 describe('HLS only video edition', function () { 273 describe('HLS only studio edition', function () {
274 274
275 before(async function () { 275 before(async function () {
276 // Disable webtorrent 276 // Disable webtorrent
@@ -300,7 +300,7 @@ describe('Test video studio', function () {
300 }) 300 })
301 }) 301 })
302 302
303 describe('Object storage video edition', function () { 303 describe('Object storage studio edition', function () {
304 if (areMockObjectStorageTestsDisabled()) return 304 if (areMockObjectStorageTestsDisabled()) return
305 305
306 before(async function () { 306 before(async function () {