Merge branch 'release/4.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / videos / video-playlist-thumbnails.ts

diff --git a/server/tests/api/videos/video-playlist-thumbnails.ts b/server/tests/api/videos/video-playlist-thumbnails.ts
index 14739af20fde57ba34184603db5a59cff64f13ba..356939b93b65bb06b75d4b3caabbf72c65ce6fc0 100644 (file)
--- a/server/tests/api/videos/video-playlist-thumbnails.ts
+++ b/server/tests/api/videos/video-playlist-thumbnails.ts
@@ -1,23 +1,20 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
+import { testImage } from '@server/tests/shared'
+import { VideoPlaylistPrivacy } from '@shared/models'
 import {
   cleanupTests,
+  createMultipleServers,
   doubleFollow,
-  flushAndRunMultipleServers,
-  ServerInfo,
+  PeerTubeServer,
   setAccessTokensToServers,
   setDefaultVideoChannel,
-  testImage,
   waitJobs
-} from '../../../../shared/extra-utils'
-import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
-
-const expect = chai.expect
+} from '@shared/server-commands'
 
 describe('Playlist thumbnail', function () {
-  let servers: ServerInfo[] = []
+  let servers: PeerTubeServer[] = []
 
   let playlistWithoutThumbnailId: number
   let playlistWithThumbnailId: number
@@ -30,14 +27,14 @@ describe('Playlist thumbnail', function () {
   let video1: number
   let video2: number
 
-  async function getPlaylistWithoutThumbnail (server: ServerInfo) {
-    const body = await server.playlistsCommand.list({ start: 0, count: 10 })
+  async function getPlaylistWithoutThumbnail (server: PeerTubeServer) {
+    const body = await server.playlists.list({ start: 0, count: 10 })
 
     return body.data.find(p => p.displayName === 'playlist without thumbnail')
   }
 
-  async function getPlaylistWithThumbnail (server: ServerInfo) {
-    const body = await server.playlistsCommand.list({ start: 0, count: 10 })
+  async function getPlaylistWithThumbnail (server: PeerTubeServer) {
+    const body = await server.playlists.list({ start: 0, count: 10 })
 
     return body.data.find(p => p.displayName === 'playlist with thumbnail')
   }
@@ -45,17 +42,21 @@ describe('Playlist thumbnail', function () {
   before(async function () {
     this.timeout(120000)
 
-    servers = await flushAndRunMultipleServers(2, { transcoding: { enabled: false } })
+    servers = await createMultipleServers(2)
 
     // Get the access tokens
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
 
+    for (const server of servers) {
+      await server.config.disableTranscoding()
+    }
+
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
 
-    video1 = (await servers[0].videosCommand.quickUpload({ name: 'video 1' })).id
-    video2 = (await servers[0].videosCommand.quickUpload({ name: 'video 2' })).id
+    video1 = (await servers[0].videos.quickUpload({ name: 'video 1' })).id
+    video2 = (await servers[0].videos.quickUpload({ name: 'video 2' })).id
 
     await waitJobs(servers)
   })
@@ -63,16 +64,16 @@ describe('Playlist thumbnail', function () {
   it('Should automatically update the thumbnail when adding an element', async function () {
     this.timeout(30000)
 
-    const created = await servers[1].playlistsCommand.create({
+    const created = await servers[1].playlists.create({
       attributes: {
         displayName: 'playlist without thumbnail',
         privacy: VideoPlaylistPrivacy.PUBLIC,
-        videoChannelId: servers[1].videoChannel.id
+        videoChannelId: servers[1].store.channel.id
       }
     })
     playlistWithoutThumbnailId = created.id
 
-    const added = await servers[1].playlistsCommand.addElement({
+    const added = await servers[1].playlists.addElement({
       playlistId: playlistWithoutThumbnailId,
       attributes: { videoId: video1 }
     })
@@ -89,17 +90,17 @@ describe('Playlist thumbnail', function () {
   it('Should not update the thumbnail if we explicitly uploaded a thumbnail', async function () {
     this.timeout(30000)
 
-    const created = await servers[1].playlistsCommand.create({
+    const created = await servers[1].playlists.create({
       attributes: {
         displayName: 'playlist with thumbnail',
         privacy: VideoPlaylistPrivacy.PUBLIC,
-        videoChannelId: servers[1].videoChannel.id,
+        videoChannelId: servers[1].store.channel.id,
         thumbnailfile: 'thumbnail.jpg'
       }
     })
     playlistWithThumbnailId = created.id
 
-    const added = await servers[1].playlistsCommand.addElement({
+    const added = await servers[1].playlists.addElement({
       playlistId: playlistWithThumbnailId,
       attributes: { videoId: video1 }
     })
@@ -116,13 +117,13 @@ describe('Playlist thumbnail', function () {
   it('Should automatically update the thumbnail when moving the first element', async function () {
     this.timeout(30000)
 
-    const added = await servers[1].playlistsCommand.addElement({
+    const added = await servers[1].playlists.addElement({
       playlistId: playlistWithoutThumbnailId,
       attributes: { videoId: video2 }
     })
     withoutThumbnailE2 = added.id
 
-    await servers[1].playlistsCommand.reorderElements({
+    await servers[1].playlists.reorderElements({
       playlistId: playlistWithoutThumbnailId,
       attributes: {
         startPosition: 1,
@@ -141,13 +142,13 @@ describe('Playlist thumbnail', function () {
   it('Should not update the thumbnail when moving the first element if we explicitly uploaded a thumbnail', async function () {
     this.timeout(30000)
 
-    const added = await servers[1].playlistsCommand.addElement({
+    const added = await servers[1].playlists.addElement({
       playlistId: playlistWithThumbnailId,
       attributes: { videoId: video2 }
     })
     withThumbnailE2 = added.id
 
-    await servers[1].playlistsCommand.reorderElements({
+    await servers[1].playlists.reorderElements({
       playlistId: playlistWithThumbnailId,
       attributes: {
         startPosition: 1,
@@ -166,7 +167,7 @@ describe('Playlist thumbnail', function () {
   it('Should automatically update the thumbnail when deleting the first element', async function () {
     this.timeout(30000)
 
-    await servers[1].playlistsCommand.removeElement({
+    await servers[1].playlists.removeElement({
       playlistId: playlistWithoutThumbnailId,
       elementId: withoutThumbnailE1
     })
@@ -182,7 +183,7 @@ describe('Playlist thumbnail', function () {
   it('Should not update the thumbnail when deleting the first element if we explicitly uploaded a thumbnail', async function () {
     this.timeout(30000)
 
-    await servers[1].playlistsCommand.removeElement({
+    await servers[1].playlists.removeElement({
       playlistId: playlistWithThumbnailId,
       elementId: withThumbnailE1
     })
@@ -198,7 +199,7 @@ describe('Playlist thumbnail', function () {
   it('Should the thumbnail when we delete the last element', async function () {
     this.timeout(30000)
 
-    await servers[1].playlistsCommand.removeElement({
+    await servers[1].playlists.removeElement({
       playlistId: playlistWithoutThumbnailId,
       elementId: withoutThumbnailE2
     })
@@ -214,7 +215,7 @@ describe('Playlist thumbnail', function () {
   it('Should not update the thumbnail when we delete the last element if we explicitly uploaded a thumbnail', async function () {
     this.timeout(30000)
 
-    await servers[1].playlistsCommand.removeElement({
+    await servers[1].playlists.removeElement({
       playlistId: playlistWithThumbnailId,
       elementId: withThumbnailE2
     })