X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-channels.ts;h=6ab5faa077cda9b1348c655ce4137d420b02f342;hb=a37e9e74ff07b057370d1ed6c0b391a02be8a6d2;hp=1efef932cbe611c1ab4977db1b415b68d01a6d11;hpb=89d241a79c262b9775c233b73cff080043ebb5e6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 1efef932c..6ab5faa07 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -6,9 +6,9 @@ import { basename } from 'path'
 import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 import {
   cleanupTests,
+  createMultipleServers,
   doubleFollow,
-  flushAndRunMultipleServers,
-  ServerInfo,
+  PeerTubeServer,
   setAccessTokensToServers,
   setDefaultVideoChannel,
   testFileExistsOrNot,
@@ -20,19 +20,20 @@ import { User, VideoChannel } from '@shared/models'
 
 const expect = chai.expect
 
-async function findChannel (server: ServerInfo, channelId: number) {
+async function findChannel (server: PeerTubeServer, channelId: number) {
   const body = await server.channels.list({ sort: '-name' })
 
   return body.data.find(c => c.id === channelId)
 }
 
 describe('Test video channels', function () {
-  let servers: ServerInfo[]
+  let servers: PeerTubeServer[]
   let userInfo: User
   let secondVideoChannelId: number
   let totoChannel: number
   let videoUUID: string
   let accountName: string
+  let secondUserChannelName: string
 
   const avatarPaths: { [ port: number ]: string } = {}
   const bannerPaths: { [ port: number ]: string } = {}
@@ -40,7 +41,7 @@ describe('Test video channels', function () {
   before(async function () {
     this.timeout(60000)
 
-    servers = await flushAndRunMultipleServers(2)
+    servers = await createMultipleServers(2)
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
@@ -219,6 +220,35 @@ describe('Test video channels', function () {
     }
   })
 
+  it('Should update another accounts video channel', async function () {
+    this.timeout(15000)
+
+    const result = await servers[0].users.generate('second_user')
+    secondUserChannelName = result.userChannelName
+
+    await servers[0].videos.quickUpload({ name: 'video', token: result.token })
+
+    const videoChannelAttributes = {
+      displayName: 'video channel updated',
+      description: 'video channel description updated',
+      support: 'support updated'
+    }
+
+    await servers[0].channels.update({ channelName: secondUserChannelName, attributes: videoChannelAttributes })
+
+    await waitJobs(servers)
+  })
+
+  it('Should have another accounts video channel updated', async function () {
+    for (const server of servers) {
+      const body = await server.channels.get({ channelName: `${secondUserChannelName}@${servers[0].host}` })
+
+      expect(body.displayName).to.equal('video channel updated')
+      expect(body.description).to.equal('video channel description updated')
+      expect(body.support).to.equal('support updated')
+    }
+  })
+
   it('Should update the channel support field and update videos too', async function () {
     this.timeout(35000)
 
@@ -324,7 +354,7 @@ describe('Test video channels', function () {
 
     for (const server of servers) {
       const channelURI = 'second_video_channel@localhost:' + servers[0].port
-      const { total, data } = await server.videos.listByChannel({ videoChannelName: channelURI })
+      const { total, data } = await server.videos.listByChannel({ handle: channelURI })
 
       expect(total).to.equal(1)
       expect(data).to.be.an('array')
@@ -347,13 +377,13 @@ describe('Test video channels', function () {
     for (const server of servers) {
       {
         const secondChannelURI = 'second_video_channel@localhost:' + servers[0].port
-        const { total } = await server.videos.listByChannel({ videoChannelName: secondChannelURI })
+        const { total } = await server.videos.listByChannel({ handle: secondChannelURI })
         expect(total).to.equal(0)
       }
 
       {
         const channelURI = 'root_channel@localhost:' + servers[0].port
-        const { total, data } = await server.videos.listByChannel({ videoChannelName: channelURI })
+        const { total, data } = await server.videos.listByChannel({ handle: channelURI })
         expect(total).to.equal(1)
 
         expect(data).to.be.an('array')
@@ -368,12 +398,13 @@ describe('Test video channels', function () {
   })
 
   it('Should have video channel deleted', async function () {
-    const body = await servers[0].channels.list({ start: 0, count: 10 })
+    const body = await servers[0].channels.list({ start: 0, count: 10, sort: 'createdAt' })
 
-    expect(body.total).to.equal(1)
+    expect(body.total).to.equal(2)
     expect(body.data).to.be.an('array')
-    expect(body.data).to.have.lengthOf(1)
+    expect(body.data).to.have.lengthOf(2)
     expect(body.data[0].displayName).to.equal('Main root channel')
+    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 () {