8 files changed, 43 insertions, 43 deletions

diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 900f642c2..c8dbbf797 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -148,7 +148,7 @@ describe('Test config API validators', function () {
         }
       }
     },
-    videoEditor: {
+    videoStudio: {
       enabled: true
     },
     import: {
diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts
index c088b52cd..c9adeef4a 100644
--- a/server/tests/api/check-params/index.ts
+++ b/server/tests/api/check-params/index.ts
@@ -25,7 +25,7 @@ import './video-blacklist'
 import './video-captions'
 import './video-channels'
 import './video-comments'
-import './video-editor'
+import './video-studio'
 import './video-imports'
 import './video-playlists'
 import './videos'
diff --git a/server/tests/api/check-params/user-notifications.ts b/server/tests/api/check-params/user-notifications.ts
index 93355e8b3..7fbe4271b 100644
--- a/server/tests/api/check-params/user-notifications.ts
+++ b/server/tests/api/check-params/user-notifications.ts
@@ -171,7 +171,7 @@ describe('Test user notifications API validators', function () {
       abuseNewMessage: UserNotificationSettingValue.WEB,
       abuseStateChange: UserNotificationSettingValue.WEB,
       newPeerTubeVersion: UserNotificationSettingValue.WEB,
-      myVideoEditionFinished: UserNotificationSettingValue.WEB,
+      myVideoStudioEditionFinished: UserNotificationSettingValue.WEB,
       newPluginVersion: UserNotificationSettingValue.WEB
     }
 
diff --git a/server/tests/api/check-params/video-editor.ts b/server/tests/api/check-params/video-studio.ts
index 5f5faf8fb..9ca55d095 100644
--- a/server/tests/api/check-params/video-editor.ts
+++ b/server/tests/api/check-params/video-studio.ts
@@ -1,19 +1,19 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-import { HttpStatusCode, VideoEditorTask } from '@shared/models'
+import { HttpStatusCode, VideoStudioTask } from '@shared/models'
 import {
   cleanupTests,
   createSingleServer,
   PeerTubeServer,
   setAccessTokensToServers,
-  VideoEditorCommand,
+  VideoStudioCommand,
   waitJobs
 } from '@shared/server-commands'
 
-describe('Test video editor API validator', function () {
+describe('Test video studio API validator', function () {
   let server: PeerTubeServer
-  let command: VideoEditorCommand
+  let command: VideoStudioCommand
   let userAccessToken: string
   let videoUUID: string
 
@@ -32,7 +32,7 @@ describe('Test video editor API validator', function () {
     const { uuid } = await server.videos.quickUpload({ name: 'video' })
     videoUUID = uuid
 
-    command = server.videoEditor
+    command = server.videoStudio
 
     await waitJobs([ server ])
   })
@@ -41,10 +41,10 @@ describe('Test video editor API validator', function () {
 
     describe('Config settings', function () {
 
-      it('Should fail if editor is disabled', async function () {
+      it('Should fail if studio is disabled', async function () {
         await server.config.updateExistingSubConfig({
           newConfig: {
-            videoEditor: {
+            videoStudio: {
               enabled: false
             }
           }
@@ -52,15 +52,15 @@ describe('Test video editor API validator', function () {
 
         await command.createEditionTasks({
           videoId: videoUUID,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
 
-      it('Should fail to enable editor if transcoding is disabled', async function () {
+      it('Should fail to enable studio if transcoding is disabled', async function () {
         await server.config.updateExistingSubConfig({
           newConfig: {
-            videoEditor: {
+            videoStudio: {
               enabled: true
             },
             transcoding: {
@@ -71,10 +71,10 @@ describe('Test video editor API validator', function () {
         })
       })
 
-      it('Should succeed to enable video editor', async function () {
+      it('Should succeed to enable video studio', async function () {
         await server.config.updateExistingSubConfig({
           newConfig: {
-            videoEditor: {
+            videoStudio: {
               enabled: true
             },
             transcoding: {
@@ -91,7 +91,7 @@ describe('Test video editor API validator', function () {
         await command.createEditionTasks({
           token: null,
           videoId: videoUUID,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.UNAUTHORIZED_401
         })
       })
@@ -100,7 +100,7 @@ describe('Test video editor API validator', function () {
         await command.createEditionTasks({
           token: userAccessToken,
           videoId: videoUUID,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.FORBIDDEN_403
         })
       })
@@ -108,7 +108,7 @@ describe('Test video editor API validator', function () {
       it('Should fail with an invalid video', async function () {
         await command.createEditionTasks({
           videoId: 'tintin',
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.BAD_REQUEST_400
         })
       })
@@ -116,7 +116,7 @@ describe('Test video editor API validator', function () {
       it('Should fail with an unknown video', async function () {
         await command.createEditionTasks({
           videoId: 42,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.NOT_FOUND_404
         })
       })
@@ -132,7 +132,7 @@ describe('Test video editor API validator', function () {
 
         await command.createEditionTasks({
           videoId: uuid,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.CONFLICT_409
         })
 
@@ -171,7 +171,7 @@ describe('Test video editor API validator', function () {
       })
 
       it('Should fail with too many tasks', async function () {
-        const tasks: VideoEditorTask[] = []
+        const tasks: VideoStudioTask[] = []
 
         for (let i = 0; i < 110; i++) {
           tasks.push({
@@ -194,7 +194,7 @@ describe('Test video editor API validator', function () {
 
         await command.createEditionTasks({
           videoId: videoUUID,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.NO_CONTENT_204
         })
       })
@@ -204,7 +204,7 @@ describe('Test video editor API validator', function () {
 
         await command.createEditionTasks({
           videoId: videoUUID,
-          tasks: VideoEditorCommand.getComplexTask(),
+          tasks: VideoStudioCommand.getComplexTask(),
           expectedStatus: HttpStatusCode.CONFLICT_409
         })
 
diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts
index c87686cb5..47e85a30c 100644
--- a/server/tests/api/notifications/user-notifications.ts
+++ b/server/tests/api/notifications/user-notifications.ts
@@ -7,7 +7,7 @@ import {
   checkMyVideoImportIsFinished,
   checkNewActorFollow,
   checkNewVideoFromSubscription,
-  checkVideoEditionIsFinished,
+  checkVideoStudioEditionIsFinished,
   checkVideoIsPublished,
   FIXTURE_URLS,
   MockSmtpServer,
@@ -16,7 +16,7 @@ import {
 } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
 import { buildUUID } from '@shared/extra-utils'
-import { UserNotification, UserNotificationType, VideoEditorTask, VideoPrivacy } from '@shared/models'
+import { UserNotification, UserNotificationType, VideoStudioTask, VideoPrivacy } from '@shared/models'
 import { cleanupTests, PeerTubeServer, waitJobs } from '@shared/server-commands'
 
 const expect = chai.expect
@@ -323,7 +323,7 @@ describe('Test user notifications', function () {
     })
   })
 
-  describe('Video editor', function () {
+  describe('Video studio', function () {
     let baseParams: CheckerBaseParams
 
     before(() => {
@@ -335,7 +335,7 @@ describe('Test user notifications', function () {
       }
     })
 
-    it('Should send a notification after editor edition', async function () {
+    it('Should send a notification after studio edition', async function () {
       this.timeout(240000)
 
       const { name, shortUUID, id } = await uploadRandomVideoOnServers(servers, 2, { waitTranscoding: true })
@@ -343,7 +343,7 @@ describe('Test user notifications', function () {
       await waitJobs(servers)
       await checkVideoIsPublished({ ...baseParams, videoName: name, shortUUID, checkType: 'presence' })
 
-      const tasks: VideoEditorTask[] = [
+      const tasks: VideoStudioTask[] = [
         {
           name: 'cut',
           options: {
@@ -352,10 +352,10 @@ describe('Test user notifications', function () {
           }
         }
       ]
-      await servers[1].videoEditor.createEditionTasks({ videoId: id, tasks })
+      await servers[1].videoStudio.createEditionTasks({ videoId: id, tasks })
       await waitJobs(servers)
 
-      await checkVideoEditionIsFinished({ ...baseParams, videoName: name, shortUUID, checkType: 'presence' })
+      await checkVideoStudioEditionIsFinished({ ...baseParams, videoName: name, shortUUID, checkType: 'presence' })
     })
   })
 
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 5028b65e6..f31012a5c 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -98,7 +98,7 @@ function checkInitialConfig (server: PeerTubeServer, data: CustomConfig) {
   expect(data.live.transcoding.resolutions['1440p']).to.be.false
   expect(data.live.transcoding.resolutions['2160p']).to.be.false
 
-  expect(data.videoEditor.enabled).to.be.false
+  expect(data.videoStudio.enabled).to.be.false
 
   expect(data.import.videos.concurrency).to.equal(2)
   expect(data.import.videos.http.enabled).to.be.true
@@ -201,7 +201,7 @@ function checkUpdatedConfig (data: CustomConfig) {
   expect(data.live.transcoding.resolutions['1080p']).to.be.true
   expect(data.live.transcoding.resolutions['2160p']).to.be.true
 
-  expect(data.videoEditor.enabled).to.be.true
+  expect(data.videoStudio.enabled).to.be.true
 
   expect(data.import.videos.concurrency).to.equal(4)
   expect(data.import.videos.http.enabled).to.be.false
@@ -350,7 +350,7 @@ const newCustomConfig: CustomConfig = {
       }
     }
   },
-  videoEditor: {
+  videoStudio: {
     enabled: true
   },
   import: {
diff --git a/server/tests/api/transcoding/index.ts b/server/tests/api/transcoding/index.ts
index 8a0a1d787..0cc28b4a4 100644
--- a/server/tests/api/transcoding/index.ts
+++ b/server/tests/api/transcoding/index.ts
@@ -2,4 +2,4 @@ export * from './audio-only'
 export * from './create-transcoding'
 export * from './hls'
 export * from './transcoder'
-export * from './video-editor'
+export * from './video-studio'
diff --git a/server/tests/api/transcoding/video-editor.ts b/server/tests/api/transcoding/video-studio.ts
index f70bd49e6..ac1c0fc7e 100644
--- a/server/tests/api/transcoding/video-editor.ts
+++ b/server/tests/api/transcoding/video-studio.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import { expectStartWith, getAllFiles } from '@server/tests/shared'
 import { areObjectStorageTestsDisabled } from '@shared/core-utils'
-import { VideoEditorTask } from '@shared/models'
+import { VideoStudioTask } from '@shared/models'
 import {
   cleanupTests,
   createMultipleServers,
@@ -10,11 +10,11 @@ import {
   PeerTubeServer,
   setAccessTokensToServers,
   setDefaultVideoChannel,
-  VideoEditorCommand,
+  VideoStudioCommand,
   waitJobs
 } from '@shared/server-commands'
 
-describe('Test video editor', function () {
+describe('Test video studio', function () {
   let servers: PeerTubeServer[] = []
   let videoUUID: string
 
@@ -39,8 +39,8 @@ describe('Test video editor', function () {
     await waitJobs(servers)
   }
 
-  async function createTasks (tasks: VideoEditorTask[]) {
-    await servers[0].videoEditor.createEditionTasks({ videoId: videoUUID, tasks })
+  async function createTasks (tasks: VideoStudioTask[]) {
+    await servers[0].videoStudio.createEditionTasks({ videoId: videoUUID, tasks })
     await waitJobs(servers)
   }
 
@@ -56,7 +56,7 @@ describe('Test video editor', function () {
 
     await servers[0].config.enableMinimumTranscoding()
 
-    await servers[0].config.enableEditor()
+    await servers[0].config.enableStudio()
   })
 
   describe('Cutting', function () {
@@ -276,7 +276,7 @@ describe('Test video editor', function () {
       this.timeout(240_000)
       await renewVideo()
 
-      await createTasks(VideoEditorCommand.getComplexTask())
+      await createTasks(VideoStudioCommand.getComplexTask())
 
       for (const server of servers) {
         await checkDuration(server, 9)
@@ -303,7 +303,7 @@ describe('Test video editor', function () {
       this.timeout(240_000)
       await renewVideo()
 
-      await createTasks(VideoEditorCommand.getComplexTask())
+      await createTasks(VideoStudioCommand.getComplexTask())
 
       for (const server of servers) {
         const video = await server.videos.get({ id: videoUUID })
@@ -333,7 +333,7 @@ describe('Test video editor', function () {
       const video = await servers[0].videos.get({ id: videoUUID })
       const oldFileUrls = getAllFiles(video).map(f => f.fileUrl)
 
-      await createTasks(VideoEditorCommand.getComplexTask())
+      await createTasks(VideoStudioCommand.getComplexTask())
 
       for (const server of servers) {
         const video = await server.videos.get({ id: videoUUID })