4 files changed, 108 insertions, 2 deletions

diff --git a/server/tests/utils/index.ts b/server/tests/utils/index.ts
index 90ee2d515..4325e4c94 100644
--- a/server/tests/utils/index.ts
+++ b/server/tests/utils/index.ts
@@ -11,4 +11,5 @@ export * from './services'
 export * from './users'
 export * from './video-abuses'
 export * from './video-blacklist'
+export * from './video-channels'
 export * from './videos'
diff --git a/server/tests/utils/login.ts b/server/tests/utils/login.ts
index c9d4aed44..22d37c46f 100644
--- a/server/tests/utils/login.ts
+++ b/server/tests/utils/login.ts
@@ -32,7 +32,7 @@ async function loginAndGetAccessToken (server: Server) {
   return res.body.access_token as string
 }
 
-async function getUserAccessToken (server, user) {
+async function getUserAccessToken (server: Server, user: User) {
   const res = await login(server.url, server.client, user, 200)
 
   return res.body.access_token as string
diff --git a/server/tests/utils/video-channels.ts b/server/tests/utils/video-channels.ts
new file mode 100644
index 000000000..5b436b183
--- /dev/null
+++ b/server/tests/utils/video-channels.ts
@@ -0,0 +1,95 @@
+import * as request from 'supertest'
+
+type VideoChannelAttributes = {
+  name?: string
+  description?: string
+}
+
+function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
+  const path = '/api/v1/videos/channels'
+
+  const req = request(url)
+    .get(path)
+    .query({ start: start })
+    .query({ count: count })
+
+  if (sort) req.query({ sort })
+
+  return req.set('Accept', 'application/json')
+            .expect(200)
+            .expect('Content-Type', /json/)
+}
+
+function getAuthorVideoChannelsList (url: string, authorId: number | string) {
+  const path = '/api/v1/videos/authors/' + authorId + '/channels'
+
+  return request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(200)
+    .expect('Content-Type', /json/)
+}
+
+function addVideoChannel (url: string, token: string, videoChannelAttributesArg: VideoChannelAttributes, expectedStatus = 204) {
+  const path = '/api/v1/videos/channels'
+
+  // Default attributes
+  let attributes = {
+    name: 'my super video channel',
+    description: 'my super channel description'
+  }
+  attributes = Object.assign(attributes, videoChannelAttributesArg)
+
+  return request(url)
+    .post(path)
+    .send(attributes)
+    .set('Accept', 'application/json')
+    .set('Authorization', 'Bearer ' + token)
+    .expect(expectedStatus)
+}
+
+function updateVideoChannel (url: string, token: string, channelId: number, attributes: VideoChannelAttributes, expectedStatus = 204) {
+  const body = {}
+  const path = '/api/v1/videos/channels/' + channelId
+
+  if (attributes.name) body['name'] = attributes.name
+  if (attributes.description) body['description'] = attributes.description
+
+  return request(url)
+    .put(path)
+    .send(body)
+    .set('Accept', 'application/json')
+    .set('Authorization', 'Bearer ' + token)
+    .expect(expectedStatus)
+}
+
+function deleteVideoChannel (url: string, token: string, channelId: number, expectedStatus = 204) {
+  const path = '/api/v1/videos/channels/'
+
+  return request(url)
+    .delete(path + channelId)
+    .set('Accept', 'application/json')
+    .set('Authorization', 'Bearer ' + token)
+    .expect(expectedStatus)
+}
+
+function getVideoChannel (url: string, channelId: number) {
+  const path = '/api/v1/videos/channels/' + channelId
+
+  return request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(200)
+    .expect('Content-Type', /json/)
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  getVideoChannelsList,
+  getAuthorVideoChannelsList,
+  addVideoChannel,
+  updateVideoChannel,
+  deleteVideoChannel,
+  getVideoChannel
+}
diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos.ts
index 2a9a236ca..08fa48da6 100644
--- a/server/tests/utils/videos.ts
+++ b/server/tests/utils/videos.ts
@@ -6,6 +6,7 @@ import * as parseTorrent from 'parse-torrent'
 import { makeGetRequest } from './requests'
 import { readFilePromise } from './miscs'
 import { ServerInfo } from './servers'
+import { getMyUserInformation } from './users'
 
 type VideoAttributes = {
   name?: string
@@ -15,6 +16,7 @@ type VideoAttributes = {
   nsfw?: boolean
   description?: string
   tags?: string[]
+  channelId?: number
   fixture?: string
 }
 
@@ -162,8 +164,14 @@ async function testVideoImage (url: string, imageName: string, imagePath: string
   }
 }
 
-function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 204) {
+async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 204) {
   const path = '/api/v1/videos/upload'
+  let defaultChannelId = '1'
+
+  try {
+    const res = await getMyUserInformation(url, accessToken)
+    defaultChannelId = res.body.videoChannels[0].id
+  } catch (e) { /* empty */ }
 
   // Default attributes
   let attributes = {
@@ -171,6 +179,7 @@ function uploadVideo (url: string, accessToken: string, videoAttributesArg: Vide
     category: 5,
     licence: 4,
     language: 3,
+    channelId: defaultChannelId,
     nsfw: true,
     description: 'my super description',
     tags: [ 'tag' ],
@@ -187,6 +196,7 @@ function uploadVideo (url: string, accessToken: string, videoAttributesArg: Vide
               .field('licence', attributes.licence.toString())
               .field('nsfw', JSON.stringify(attributes.nsfw))
               .field('description', attributes.description)
+              .field('channelId', attributes.channelId)
 
   if (attributes.language !== undefined) {
     req.field('language', attributes.language.toString())