Implement support field in video and video channel

3 files changed, 90 insertions, 45 deletions

diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 85d158d61..c82ac1348 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -70,6 +70,7 @@ describe('Test multiple servers', function () {
         language: 9,
         nsfw: true,
         description: 'my super description for server 1',
+        support: 'my super support text for server 1',
         tags: [ 'tag1p1', 'tag2p1' ],
         channelId: videoChannelId,
         fixture: 'video_short1.webm'
@@ -88,6 +89,7 @@ describe('Test multiple servers', function () {
           language: 9,
           nsfw: true,
           description: 'my super description for server 1',
+          support: 'my super support text for server 1',
           host: 'localhost:9001',
           account: 'root',
           isLocal,
@@ -136,6 +138,7 @@ describe('Test multiple servers', function () {
         language: 11,
         nsfw: true,
         description: 'my super description for server 2',
+        support: 'my super support text for server 2',
         tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ],
         fixture: 'video_short2.webm',
         thumbnailfile: 'thumbnail.jpg',
@@ -156,6 +159,7 @@ describe('Test multiple servers', function () {
           language: 11,
           nsfw: true,
           description: 'my super description for server 2',
+          support: 'my super support text for server 2',
           host: 'localhost:9002',
           account: 'user1',
           isLocal,
@@ -211,6 +215,7 @@ describe('Test multiple servers', function () {
         language: 11,
         nsfw: true,
         description: 'my super description for server 3',
+        support: 'my super support text for server 3',
         tags: [ 'tag1p3' ],
         fixture: 'video_short3.webm'
       }
@@ -223,6 +228,7 @@ describe('Test multiple servers', function () {
         language: 12,
         nsfw: false,
         description: 'my super description for server 3-2',
+        support: 'my super support text for server 3-2',
         tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ],
         fixture: 'video_short.webm'
       }
@@ -257,6 +263,7 @@ describe('Test multiple servers', function () {
           language: 11,
           nsfw: true,
           description: 'my super description for server 3',
+          support: 'my super support text for server 3',
           host: 'localhost:9003',
           account: 'root',
           isLocal,
@@ -286,6 +293,7 @@ describe('Test multiple servers', function () {
           language: 12,
           nsfw: false,
           description: 'my super description for server 3-2',
+          support: 'my super support text for server 3-2',
           host: 'localhost:9003',
           account: 'root',
           commentsEnabled: true,
@@ -525,6 +533,7 @@ describe('Test multiple servers', function () {
         language: 13,
         nsfw: true,
         description: 'my super description updated',
+        support: 'my super support text updated',
         tags: [ 'tag_up_1', 'tag_up_2' ],
         thumbnailfile: 'thumbnail.jpg',
         previewfile: 'preview.jpg'
@@ -553,6 +562,7 @@ describe('Test multiple servers', function () {
           language: 13,
           nsfw: true,
           description: 'my super description updated',
+          support: 'my super support text updated',
           host: 'localhost:9003',
           account: 'root',
           isLocal,
@@ -841,6 +851,7 @@ describe('Test multiple servers', function () {
           language: null,
           nsfw: false,
           description: null,
+          support: null,
           host: 'localhost:9002',
           account: 'root',
           isLocal,
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index 8f55075fb..83b6a0e9a 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -26,6 +26,7 @@ describe('Test a single server', function () {
     language: 3,
     nsfw: true,
     description: 'my super description',
+    support: 'my super support text',
     host: 'localhost:9001',
     account: 'root',
     isLocal: true,
@@ -54,6 +55,7 @@ describe('Test a single server', function () {
     language: 5,
     nsfw: false,
     description: 'my super description updated',
+    support: 'my super support text updated',
     host: 'localhost:9001',
     account: 'root',
     isLocal: true,
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 25b7ad6ab..b9c9bbf3c 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -1,27 +1,27 @@
 /* tslint:disable:no-unused-expression */
 
-import 'mocha'
 import * as chai from 'chai'
-const expect = chai.expect
-
+import 'mocha'
+import { User } from '../../../../shared/index'
+import { doubleFollow, flushAndRunMultipleServers, uploadVideo, wait } from '../../utils'
 import {
-  ServerInfo,
+  addVideoChannel,
+  deleteVideoChannel,
   flushTests,
-  runServer,
-  setAccessTokensToServers,
-  killallServers,
+  getAccountVideoChannelsList,
   getMyUserInformation,
+  getVideoChannel,
   getVideoChannelsList,
-  addVideoChannel,
-  getAccountVideoChannelsList,
-  updateVideoChannel,
-  deleteVideoChannel,
-  getVideoChannel
+  killallServers,
+  ServerInfo,
+  setAccessTokensToServers,
+  updateVideoChannel
 } from '../../utils/index'
-import { User } from '../../../../shared/index'
 
-describe('Test a video channels', function () {
-  let server: ServerInfo
+const expect = chai.expect
+
+describe('Test video channels', function () {
+  let servers: ServerInfo[]
   let userInfo: User
   let videoChannelId: number
 
@@ -30,29 +30,41 @@ describe('Test a video channels', function () {
 
     await flushTests()
 
-    server = await runServer(1)
+    servers = await flushAndRunMultipleServers(2)
+
+    await setAccessTokensToServers(servers)
+    await doubleFollow(servers[0], servers[1])
 
-    await setAccessTokensToServers([ server ])
+    await wait(5000)
   })
 
   it('Should have one video channel (created with root)', async () => {
-    const res = await getVideoChannelsList(server.url, 0, 2)
+    const res = await getVideoChannelsList(servers[0].url, 0, 2)
 
     expect(res.body.total).to.equal(1)
     expect(res.body.data).to.be.an('array')
     expect(res.body.data).to.have.lengthOf(1)
   })
 
-  it('Should create another video channel', async () => {
+  it('Should create another video channel', async function () {
+    this.timeout(10000)
+
     const videoChannel = {
       name: 'second video channel',
-      description: 'super video channel description'
+      description: 'super video channel description',
+      support: 'super video channel support text'
     }
-    await addVideoChannel(server.url, server.accessToken, videoChannel)
+    const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+    videoChannelId = res.body.videoChannel.id
+
+    // The channel is 1 is propagated to servers 2
+    await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: videoChannelId })
+
+    await wait(3000)
   })
 
   it('Should have two video channels when getting my information', async () => {
-    const res = await getMyUserInformation(server.url, server.accessToken)
+    const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
     userInfo = res.body
 
     expect(userInfo.videoChannels).to.be.an('array')
@@ -62,11 +74,11 @@ describe('Test a video channels', function () {
     expect(videoChannels[0].displayName).to.equal('Default root channel')
     expect(videoChannels[1].displayName).to.equal('second video channel')
     expect(videoChannels[1].description).to.equal('super video channel description')
+    expect(videoChannels[1].support).to.equal('super video channel support text')
   })
 
-  it('Should have two video channels when getting account channels', async () => {
-    const res = await getAccountVideoChannelsList(server.url, userInfo.account.uuid)
-
+  it('Should have two video channels when getting account channels on server 1', async function () {
+    const res = await getAccountVideoChannelsList(servers[0].url, userInfo.account.uuid)
     expect(res.body.total).to.equal(2)
     expect(res.body.data).to.be.an('array')
     expect(res.body.data).to.have.lengthOf(2)
@@ -75,12 +87,23 @@ describe('Test a video channels', function () {
     expect(videoChannels[0].displayName).to.equal('Default root channel')
     expect(videoChannels[1].displayName).to.equal('second video channel')
     expect(videoChannels[1].description).to.equal('super video channel description')
+    expect(videoChannels[1].support).to.equal('super video channel support text')
+  })
+
+  it('Should have one video channel when getting account channels on server 2', async function () {
+    const res = await getAccountVideoChannelsList(servers[1].url, userInfo.account.uuid)
+    expect(res.body.total).to.equal(1)
+    expect(res.body.data).to.be.an('array')
+    expect(res.body.data).to.have.lengthOf(1)
 
-    videoChannelId = videoChannels[1].id
+    const videoChannels = res.body.data
+    expect(videoChannels[0].displayName).to.equal('second video channel')
+    expect(videoChannels[0].description).to.equal('super video channel description')
+    expect(videoChannels[0].support).to.equal('super video channel support text')
   })
 
-  it('Should list video channels', async () => {
-    const res = await getVideoChannelsList(server.url, 1, 1, '-name')
+  it('Should list video channels', async function () {
+    const res = await getVideoChannelsList(servers[0].url, 1, 1, '-name')
 
     expect(res.body.total).to.equal(2)
     expect(res.body.data).to.be.an('array')
@@ -88,39 +111,48 @@ describe('Test a video channels', function () {
     expect(res.body.data[0].displayName).to.equal('Default root channel')
   })
 
-  it('Should update video channel', async () => {
+  it('Should update video channel', async function () {
+    this.timeout(5000)
+
     const videoChannelAttributes = {
       name: 'video channel updated',
-      description: 'video channel description updated'
+      description: 'video channel description updated',
+      support: 'video channel support text updated'
     }
 
-    await updateVideoChannel(server.url, server.accessToken, videoChannelId, videoChannelAttributes)
+    await updateVideoChannel(servers[0].url, servers[0].accessToken, videoChannelId, videoChannelAttributes)
+
+    await wait(3000)
   })
 
-  it('Should have video channel updated', async () => {
-    const res = await getVideoChannelsList(server.url, 0, 1, '-name')
+  it('Should have video channel updated', async function () {
+    for (const server of servers) {
+      const res = await getVideoChannelsList(server.url, 0, 1, '-name')
 
-    expect(res.body.total).to.equal(2)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data).to.have.lengthOf(1)
-    expect(res.body.data[0].displayName).to.equal('video channel updated')
-    expect(res.body.data[0].description).to.equal('video channel description updated')
+      expect(res.body.total).to.equal(2)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].displayName).to.equal('video channel updated')
+      expect(res.body.data[0].description).to.equal('video channel description updated')
+      expect(res.body.data[0].support).to.equal('video channel support text updated')
+    }
   })
 
-  it('Should get video channel', async () => {
-    const res = await getVideoChannel(server.url, videoChannelId)
+  it('Should get video channel', async function () {
+    const res = await getVideoChannel(servers[0].url, videoChannelId)
 
     const videoChannel = res.body
     expect(videoChannel.displayName).to.equal('video channel updated')
     expect(videoChannel.description).to.equal('video channel description updated')
+    expect(videoChannel.support).to.equal('video channel support text updated')
   })
 
-  it('Should delete video channel', async () => {
-    await deleteVideoChannel(server.url, server.accessToken, videoChannelId)
+  it('Should delete video channel', async function () {
+    await deleteVideoChannel(servers[0].url, servers[0].accessToken, videoChannelId)
   })
 
-  it('Should have video channel deleted', async () => {
-    const res = await getVideoChannelsList(server.url, 0, 10)
+  it('Should have video channel deleted', async function () {
+    const res = await getVideoChannelsList(servers[0].url, 0, 10)
 
     expect(res.body.total).to.equal(1)
     expect(res.body.data).to.be.an('array')
@@ -129,7 +161,7 @@ describe('Test a video channels', function () {
   })
 
   after(async function () {
-    killallServers([ server ])
+    killallServers(servers)
 
     // Keep the logs if the test failed
     if (this['ok']) {