Merge branch 'release/4.3.0' into develop

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

diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 42e0cf4312db18645ed8a2d8cfef1cfe2104fcb0..86a8a038cf83d911059788fb403ee4534f8a262b 100644 (file)
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { basename } from 'path'
 import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 import { testFileExistsOrNot, testImage } from '@server/tests/shared'
@@ -18,8 +17,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 async function findChannel (server: PeerTubeServer, channelId: number) {
   const body = await server.channels.list({ sort: '-name' })
 
@@ -59,7 +56,7 @@ describe('Test video channels', function () {
   })
 
   it('Should create another video channel', async function () {
-    this.timeout(10000)
+    this.timeout(30000)
 
     {
       const videoChannel = {
@@ -430,7 +427,7 @@ describe('Test video channels', function () {
     expect(body.data[1].displayName).to.equal('video channel updated')
   })
 
-  it('Should create the main channel with an uuid if there is a conflict', async function () {
+  it('Should create the main channel with a suffix if there is a conflict', async function () {
     {
       const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' }
       const created = await servers[0].channels.create({ attributes: videoChannel })
@@ -442,8 +439,7 @@ describe('Test video channels', function () {
       const accessToken = await servers[0].login.getAccessToken({ username: 'toto', password: 'password' })
 
       const { videoChannels } = await servers[0].users.getMyInfo({ token: accessToken })
-      const videoChannel = videoChannels[0]
-      expect(videoChannel.name).to.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/)
+      expect(videoChannels[0].name).to.equal('toto_channel-1')
     }
   })