Add ability to set a name to a channel

2 files changed, 26 insertions, 40 deletions

diff --git a/server/tests/api/check-params/user-subscriptions.ts b/server/tests/api/check-params/user-subscriptions.ts
index 9f7d15b27..628a74476 100644
--- a/server/tests/api/check-params/user-subscriptions.ts
+++ b/server/tests/api/check-params/user-subscriptions.ts
@@ -5,7 +5,6 @@ import 'mocha'
 import {
   createUser,
   flushTests,
-  getMyUserInformation,
   killallServers,
   makeDeleteRequest,
   makeGetRequest,
@@ -21,7 +20,6 @@ describe('Test user subscriptions API validators', function () {
   const path = '/api/v1/users/me/subscriptions'
   let server: ServerInfo
   let userAccessToken = ''
-  let userChannelUUID: string
 
   // ---------------------------------------------------------------
 
@@ -40,11 +38,6 @@ describe('Test user subscriptions API validators', function () {
     }
     await createUser(server.url, server.accessToken, user.username, user.password)
     userAccessToken = await userLogin(server, user)
-
-    {
-      const res = await getMyUserInformation(server.url, server.accessToken)
-      userChannelUUID = res.body.videoChannels[ 0 ].uuid
-    }
   })
 
   describe('When listing my subscriptions', function () {
@@ -69,7 +62,7 @@ describe('Test user subscriptions API validators', function () {
     })
 
     it('Should success with the correct parameters', async function () {
-      await await makeGetRequest({
+      await makeGetRequest({
         url: server.url,
         path,
         token: userAccessToken,
@@ -102,7 +95,7 @@ describe('Test user subscriptions API validators', function () {
     })
 
     it('Should success with the correct parameters', async function () {
-      await await makeGetRequest({
+      await makeGetRequest({
         url: server.url,
         path,
         token: userAccessToken,
@@ -116,7 +109,7 @@ describe('Test user subscriptions API validators', function () {
       await makePostBodyRequest({
         url: server.url,
         path,
-        fields: { uri: userChannelUUID + '@localhost:9001' },
+        fields: { uri: 'user1_channel@localhost:9001' },
         statusCodeExpected: 401
       })
     })
@@ -152,7 +145,7 @@ describe('Test user subscriptions API validators', function () {
         url: server.url,
         path,
         token: server.accessToken,
-        fields: { uri: userChannelUUID + '@localhost:9001' },
+        fields: { uri: 'user1_channel@localhost:9001' },
         statusCodeExpected: 204
       })
     })
@@ -162,7 +155,7 @@ describe('Test user subscriptions API validators', function () {
     it('Should fail with a non authenticated user', async function () {
       await makeDeleteRequest({
         url: server.url,
-        path: path + '/' + userChannelUUID + '@localhost:9001',
+        path: path + '/user1_channel@localhost:9001',
         statusCodeExpected: 401
       })
     })
@@ -202,7 +195,7 @@ describe('Test user subscriptions API validators', function () {
     it('Should success with the correct parameters', async function () {
       await makeDeleteRequest({
         url: server.url,
-        path: path + '/' + userChannelUUID + '@localhost:9001',
+        path: path + '/user1_channel@localhost:9001',
         token: server.accessToken,
         statusCodeExpected: 204
       })
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index 0980de73b..bcf4b7473 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -31,7 +31,6 @@ describe('Test video channels API validator', function () {
   const videoChannelPath = '/api/v1/video-channels'
   let server: ServerInfo
   let accessTokenUser: string
-  let videoChannelUUID: string
 
   // ---------------------------------------------------------------
 
@@ -53,12 +52,6 @@ describe('Test video channels API validator', function () {
       await createUser(server.url, server.accessToken, user.username, user.password)
       accessTokenUser = await userLogin(server, user)
     }
-
-    {
-      const res = await getMyUserInformation(server.url, server.accessToken)
-      const user: User = res.body
-      videoChannelUUID = user.videoChannels[0].uuid
-    }
   })
 
   describe('When listing a video channels', function () {
@@ -83,6 +76,7 @@ describe('Test video channels API validator', function () {
 
   describe('When adding a video channel', function () {
     const baseCorrectParams = {
+      name: 'super_channel',
       displayName: 'hello',
       description: 'super description',
       support: 'super support text'
@@ -104,6 +98,16 @@ describe('Test video channels API validator', function () {
     })
 
     it('Should fail without a name', async function () {
+      const fields = omit(baseCorrectParams, 'name')
+      await makePostBodyRequest({ url: server.url, path: videoChannelPath, token: server.accessToken, fields })
+    })
+
+    it('Should fail with a bad name', async function () {
+      const fields = immutableAssign(baseCorrectParams, { name: 'super name' })
+      await makePostBodyRequest({ url: server.url, path: videoChannelPath, token: server.accessToken, fields })
+    })
+
+    it('Should fail without a name', async function () {
       const fields = omit(baseCorrectParams, 'displayName')
       await makePostBodyRequest({ url: server.url, path: videoChannelPath, token: server.accessToken, fields })
     })
@@ -142,7 +146,7 @@ describe('Test video channels API validator', function () {
     let path: string
 
     before(async function () {
-      path = videoChannelPath + '/' + videoChannelUUID
+      path = videoChannelPath + '/super_channel'
     })
 
     it('Should fail with a non authenticated user', async function () {
@@ -195,7 +199,7 @@ describe('Test video channels API validator', function () {
     let path: string
 
     before(async function () {
-      path = videoChannelPath + '/' + videoChannelUUID
+      path = videoChannelPath + '/super_channel'
     })
 
     it('Should fail with an incorrect input file', async function () {
@@ -255,18 +259,10 @@ describe('Test video channels API validator', function () {
       expect(res.body.data).to.be.an('array')
     })
 
-    it('Should fail without a correct uuid', async function () {
-      await makeGetRequest({
-        url: server.url,
-        path: videoChannelPath + '/coucou',
-        statusCodeExpected: 400
-      })
-    })
-
     it('Should return 404 with an incorrect video channel', async function () {
       await makeGetRequest({
         url: server.url,
-        path: videoChannelPath + '/4da6fde3-88f7-4d16-b119-108df5630b06',
+        path: videoChannelPath + '/super_channel2',
         statusCodeExpected: 404
       })
     })
@@ -274,7 +270,7 @@ describe('Test video channels API validator', function () {
     it('Should succeed with the correct parameters', async function () {
       await makeGetRequest({
         url: server.url,
-        path: videoChannelPath + '/' + videoChannelUUID,
+        path: videoChannelPath + '/super_channel',
         statusCodeExpected: 200
       })
     })
@@ -282,26 +278,23 @@ describe('Test video channels API validator', function () {
 
   describe('When deleting a video channel', function () {
     it('Should fail with a non authenticated user', async function () {
-      await deleteVideoChannel(server.url, 'coucou', videoChannelUUID, 401)
+      await deleteVideoChannel(server.url, 'coucou', 'super_channel', 401)
     })
 
     it('Should fail with another authenticated user', async function () {
-      await deleteVideoChannel(server.url, accessTokenUser, videoChannelUUID, 403)
+      await deleteVideoChannel(server.url, accessTokenUser, 'super_channel', 403)
     })
 
     it('Should fail with an unknown video channel id', async function () {
-      await deleteVideoChannel(server.url, server.accessToken,454554, 404)
+      await deleteVideoChannel(server.url, server.accessToken,'super_channel2', 404)
     })
 
     it('Should succeed with the correct parameters', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, videoChannelUUID)
+      await deleteVideoChannel(server.url, server.accessToken, 'super_channel')
     })
 
     it('Should fail to delete the last user video channel', async function () {
-      const res = await getVideoChannelsList(server.url, 0, 1)
-      const lastVideoChannelUUID = res.body.data[0].uuid
-
-      await deleteVideoChannel(server.url, server.accessToken, lastVideoChannelUUID, 409)
+      await deleteVideoChannel(server.url, server.accessToken, 'root_channel', 409)
     })
   })