6 files changed, 127 insertions, 2 deletions

diff --git a/server/tests/api/check-params/videos.js b/server/tests/api/check-params/videos.js
index 03b4db3fe..e58f9893b 100644
--- a/server/tests/api/check-params/videos.js
+++ b/server/tests/api/check-params/videos.js
@@ -113,6 +113,7 @@ describe('Test videos API validator', function () {
     it('Should fail without name', function (done) {
       const data = {
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -126,6 +127,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'My very very very very very very very very very very very very very very very very long name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -138,6 +140,7 @@ describe('Test videos API validator', function () {
     it('Should fail without a category', function (done) {
       const data = {
         name: 'my super name',
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -151,6 +154,34 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 125,
+        licence: 1,
+        description: 'my super description',
+        tags: [ 'tag1', 'tag2' ]
+      }
+      const attach = {
+        'videofile': pathUtils.join(__dirname, '..', 'fixtures', 'video_short.webm')
+      }
+      requestsUtils.makePostUploadRequest(server.url, path, server.accessToken, data, attach, done)
+    })
+
+    it('Should fail without a licence', function (done) {
+      const data = {
+        name: 'my super name',
+        category: 5,
+        description: 'my super description',
+        tags: [ 'tag1', 'tag2' ]
+      }
+      const attach = {
+        'videofile': pathUtils.join(__dirname, '..', 'fixtures', 'video_short.webm')
+      }
+      requestsUtils.makePostUploadRequest(server.url, path, server.accessToken, data, attach, done)
+    })
+
+    it('Should fail with a bad licence', function (done) {
+      const data = {
+        name: 'my super name',
+        category: 5,
+        licence: 125,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -164,6 +195,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         tags: [ 'tag1', 'tag2' ]
       }
       const attach = {
@@ -176,6 +208,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description which is very very very very very very very very very very very very very very' +
                      'very very very very very very very very very very very very very very very very very very very very very' +
                      'very very very very very very very very very very very very very very very long',
@@ -191,6 +224,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2', 'tag3', 'tag4' ]
       }
@@ -204,6 +238,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 't' ]
       }
@@ -217,6 +252,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'mysupertagtoolong', 'tag1' ]
       }
@@ -230,6 +266,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -241,6 +278,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -254,6 +292,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -267,6 +306,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 1,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -304,6 +344,7 @@ describe('Test videos API validator', function () {
     it('Should fail without a valid uuid', function (done) {
       const data = {
         category: 5,
+        licence: 2,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -313,6 +354,7 @@ describe('Test videos API validator', function () {
     it('Should fail with an unknown id', function (done) {
       const data = {
         category: 5,
+        licence: 2,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -323,6 +365,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'My very very very very very very very very very very very very very very very very long name',
         category: 5,
+        licence: 2,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -333,6 +376,18 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 128,
+        licence: 2,
+        description: 'my super description',
+        tags: [ 'tag1', 'tag2' ]
+      }
+      requestsUtils.makePutBodyRequest(server.url, path + videoId, server.accessToken, data, done)
+    })
+
+    it('Should fail with a bad licence', function (done) {
+      const data = {
+        name: 'my super name',
+        category: 5,
+        licence: 128,
         description: 'my super description',
         tags: [ 'tag1', 'tag2' ]
       }
@@ -343,6 +398,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 2,
         description: 'my super description which is very very very very very very very very very very very very very very' +
                      'very very very very very very very very very very very very very very very very very very very very very' +
                      'very very very very very very very very very very very very very very very long',
@@ -355,6 +411,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 2,
         description: 'my super description',
         tags: [ 'tag1', 'tag2', 'tag3', 'tag4' ]
       }
@@ -365,6 +422,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 2,
         description: 'my super description',
         tags: [ 'tag1', 't' ]
       }
@@ -375,6 +433,7 @@ describe('Test videos API validator', function () {
       const data = {
         name: 'my super name',
         category: 5,
+        licence: 2,
         description: 'my super description',
         tags: [ 'mysupertagtoolong', 'tag1' ]
       }
diff --git a/server/tests/api/multiple-pods.js b/server/tests/api/multiple-pods.js
index d5c723b3b..69ef38c20 100644
--- a/server/tests/api/multiple-pods.js
+++ b/server/tests/api/multiple-pods.js
@@ -82,6 +82,8 @@ describe('Test multiple pods', function () {
         function (next) {
           const videoAttributes = {
             name: 'my super name for pod 1',
+            category: 5,
+            licence: 4,
             description: 'my super description for pod 1',
             tags: [ 'tag1p1', 'tag2p1' ],
             fixture: 'video_short1.webm'
@@ -108,6 +110,8 @@ describe('Test multiple pods', function () {
               expect(video.name).to.equal('my super name for pod 1')
               expect(video.category).to.equal(5)
               expect(video.categoryLabel).to.equal('Sports')
+              expect(video.licence).to.equal(4)
+              expect(video.licenceLabel).to.equal('Attribution - Non Commercial')
               expect(video.description).to.equal('my super description for pod 1')
               expect(video.podHost).to.equal('localhost:9001')
               expect(video.magnetUri).to.exist
@@ -150,6 +154,7 @@ describe('Test multiple pods', function () {
           const videoAttributes = {
             name: 'my super name for pod 2',
             category: 4,
+            licence: 3,
             description: 'my super description for pod 2',
             tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ],
             fixture: 'video_short2.webm'
@@ -176,6 +181,8 @@ describe('Test multiple pods', function () {
               expect(video.name).to.equal('my super name for pod 2')
               expect(video.category).to.equal(4)
               expect(video.categoryLabel).to.equal('Art')
+              expect(video.licence).to.equal(3)
+              expect(video.licenceLabel).to.equal('Attribution - No Derivatives')
               expect(video.description).to.equal('my super description for pod 2')
               expect(video.podHost).to.equal('localhost:9002')
               expect(video.magnetUri).to.exist
@@ -218,6 +225,7 @@ describe('Test multiple pods', function () {
           const videoAttributes = {
             name: 'my super name for pod 3',
             category: 6,
+            licence: 5,
             description: 'my super description for pod 3',
             tags: [ 'tag1p3' ],
             fixture: 'video_short3.webm'
@@ -228,6 +236,7 @@ describe('Test multiple pods', function () {
           const videoAttributes = {
             name: 'my super name for pod 3-2',
             category: 7,
+            licence: 6,
             description: 'my super description for pod 3-2',
             tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ],
             fixture: 'video_short.webm'
@@ -264,6 +273,8 @@ describe('Test multiple pods', function () {
               expect(video1.name).to.equal('my super name for pod 3')
               expect(video1.category).to.equal(6)
               expect(video1.categoryLabel).to.equal('Travels')
+              expect(video1.licence).to.equal(5)
+              expect(video1.licenceLabel).to.equal('Attribution - Non Commercial - Share Alike')
               expect(video1.description).to.equal('my super description for pod 3')
               expect(video1.podHost).to.equal('localhost:9003')
               expect(video1.magnetUri).to.exist
@@ -276,6 +287,8 @@ describe('Test multiple pods', function () {
               expect(video2.name).to.equal('my super name for pod 3-2')
               expect(video2.category).to.equal(7)
               expect(video2.categoryLabel).to.equal('Gaming')
+              expect(video2.licence).to.equal(6)
+              expect(video2.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
               expect(video2.description).to.equal('my super description for pod 3-2')
               expect(video2.podHost).to.equal('localhost:9003')
               expect(video2.magnetUri).to.exist
@@ -624,6 +637,7 @@ describe('Test multiple pods', function () {
       const attributes = {
         name: 'my super video updated',
         category: 10,
+        licence: 7,
         description: 'my super description updated',
         tags: [ 'tagup1', 'tagup2' ]
       }
@@ -652,6 +666,8 @@ describe('Test multiple pods', function () {
           expect(!!videoUpdated).to.be.true
           expect(videoUpdated.category).to.equal(10)
           expect(videoUpdated.categoryLabel).to.equal('Entertainment')
+          expect(videoUpdated.licence).to.equal(7)
+          expect(videoUpdated.licenceLabel).to.equal('Public Domain Dedication')
           expect(videoUpdated.description).to.equal('my super description updated')
           expect(videoUpdated.tags).to.deep.equal([ 'tagup1', 'tagup2' ])
           expect(miscsUtils.dateIsValid(videoUpdated.updatedAt, 20000)).to.be.true
diff --git a/server/tests/api/single-pod.js b/server/tests/api/single-pod.js
index 9465f6034..6d7ebdc9b 100644
--- a/server/tests/api/single-pod.js
+++ b/server/tests/api/single-pod.js
@@ -57,6 +57,19 @@ describe('Test a single pod', function () {
     })
   })
 
+  it('Should list video licences', function (done) {
+    videosUtils.getVideoLicences(server.url, function (err, res) {
+      if (err) throw err
+
+      const licences = res.body
+      expect(Object.keys(licences)).to.have.length.above(5)
+
+      expect(licences[3]).to.equal('Attribution - No Derivatives')
+
+      done()
+    })
+  })
+
   it('Should not have videos', function (done) {
     videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
@@ -73,6 +86,7 @@ describe('Test a single pod', function () {
     const videoAttributes = {
       name: 'my super name',
       category: 2,
+      licence: 6,
       tags: [ 'tag1', 'tag2', 'tag3' ]
     }
     videosUtils.uploadVideo(server.url, server.accessToken, videoAttributes, done)
@@ -93,6 +107,8 @@ describe('Test a single pod', function () {
       expect(video.name).to.equal('my super name')
       expect(video.category).to.equal(2)
       expect(video.categoryLabel).to.equal('Films')
+      expect(video.licence).to.equal(6)
+      expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
       expect(video.description).to.equal('my super description')
       expect(video.podHost).to.equal('localhost:9001')
       expect(video.magnetUri).to.exist
@@ -130,6 +146,8 @@ describe('Test a single pod', function () {
       expect(video.name).to.equal('my super name')
       expect(video.category).to.equal(2)
       expect(video.categoryLabel).to.equal('Films')
+      expect(video.licence).to.equal(6)
+      expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
       expect(video.description).to.equal('my super description')
       expect(video.podHost).to.equal('localhost:9001')
       expect(video.magnetUri).to.exist
@@ -171,6 +189,8 @@ describe('Test a single pod', function () {
       expect(video.name).to.equal('my super name')
       expect(video.category).to.equal(2)
       expect(video.categoryLabel).to.equal('Films')
+      expect(video.licence).to.equal(6)
+      expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
       expect(video.description).to.equal('my super description')
       expect(video.podHost).to.equal('localhost:9001')
       expect(video.author).to.equal('root')
@@ -228,6 +248,8 @@ describe('Test a single pod', function () {
       expect(video.name).to.equal('my super name')
       expect(video.category).to.equal(2)
       expect(video.categoryLabel).to.equal('Films')
+      expect(video.licence).to.equal(6)
+      expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
       expect(video.description).to.equal('my super description')
       expect(video.podHost).to.equal('localhost:9001')
       expect(video.author).to.equal('root')
@@ -324,6 +346,7 @@ describe('Test a single pod', function () {
         name: video + ' name',
         description: video + ' description',
         category: 2,
+        licence: 1,
         tags: [ 'tag1', 'tag2', 'tag3' ],
         fixture: video
       }
@@ -548,6 +571,7 @@ describe('Test a single pod', function () {
     const attributes = {
       name: 'my super video updated',
       category: 4,
+      licence: 2,
       description: 'my super description updated',
       tags: [ 'tagup1', 'tagup2' ]
     }
@@ -565,6 +589,8 @@ describe('Test a single pod', function () {
       expect(video.name).to.equal('my super video updated')
       expect(video.category).to.equal(4)
       expect(video.categoryLabel).to.equal('Art')
+      expect(video.licence).to.equal(2)
+      expect(video.licenceLabel).to.equal('Attribution - Share Alike')
       expect(video.description).to.equal('my super description updated')
       expect(video.podHost).to.equal('localhost:9001')
       expect(video.author).to.equal('root')
@@ -604,6 +630,8 @@ describe('Test a single pod', function () {
         expect(video.name).to.equal('my super video updated')
         expect(video.category).to.equal(4)
         expect(video.categoryLabel).to.equal('Art')
+        expect(video.licence).to.equal(2)
+        expect(video.licenceLabel).to.equal('Attribution - Share Alike')
         expect(video.description).to.equal('my super description updated')
         expect(video.podHost).to.equal('localhost:9001')
         expect(video.author).to.equal('root')
@@ -633,6 +661,8 @@ describe('Test a single pod', function () {
         expect(video.name).to.equal('my super video updated')
         expect(video.category).to.equal(4)
         expect(video.categoryLabel).to.equal('Art')
+        expect(video.licence).to.equal(2)
+        expect(video.licenceLabel).to.equal('Attribution - Share Alike')
         expect(video.description).to.equal('hello everybody')
         expect(video.podHost).to.equal('localhost:9001')
         expect(video.author).to.equal('root')
diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index 32afeec68..7777768c8 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -205,6 +205,7 @@ function upload (servers, numServer, callback) {
   const videoAttributes = {
     name: Date.now() + ' name',
     category: 4,
+    licence: 2,
     description: Date.now() + ' description',
     tags: [ Date.now().toString().substring(0, 5) + 't1', Date.now().toString().substring(0, 5) + 't2' ],
     fixture: 'video_short1.webm'
diff --git a/server/tests/real-world/tools/upload.js b/server/tests/real-world/tools/upload.js
index 856251c7f..7b97ebf0b 100644
--- a/server/tests/real-world/tools/upload.js
+++ b/server/tests/real-world/tools/upload.js
@@ -9,7 +9,8 @@ program
   .option('-u, --url <url>', 'Server url')
   .option('-a, --access-token <token>', 'Access token')
   .option('-n, --name <name>', 'Video name')
-  .option('-d, --category <category number>', 'Category number')
+  .option('-c, --category <category number>', 'Category number')
+  .option('-l, --licence <licence number>', 'Licence number')
   .option('-d, --description <description>', 'Video description')
   .option('-t, --tags <tags>', 'Video tags', list)
   .option('-f, --file <file>', 'Video absolute file path')
@@ -20,6 +21,7 @@ if (
   !program.accessToken ||
   !program.name ||
   !program.category ||
+  !program.licence ||
   !program.description ||
   !program.tags ||
   !Array.isArray(program.tags) ||
@@ -37,6 +39,7 @@ fs.access(program.file, fs.F_OK, function (err) {
     program.accessToken,
     program.name,
     program.category,
+    program.licence,
     program.description,
     program.tags,
     program.file
@@ -49,12 +52,13 @@ function list (val) {
   return val.split(',')
 }
 
-function upload (url, accessToken, name, category, description, tags, fixture) {
+function upload (url, accessToken, name, category, licence, description, tags, fixture) {
   console.log('Uploading %s video...', program.name)
 
   const videoAttributes = {
     name,
     category,
+    licence,
     description,
     tags,
     fixture
diff --git a/server/tests/utils/videos.js b/server/tests/utils/videos.js
index ad0d74076..d1e0b7b14 100644
--- a/server/tests/utils/videos.js
+++ b/server/tests/utils/videos.js
@@ -6,6 +6,7 @@ const request = require('supertest')
 
 const videosUtils = {
   getVideoCategories,
+  getVideoLicences,
   getAllVideosListBy,
   getVideo,
   getVideosList,
@@ -34,6 +35,17 @@ function getVideoCategories (url, end) {
     .end(end)
 }
 
+function getVideoLicences (url, end) {
+  const path = '/api/v1/videos/licences'
+
+  request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(200)
+    .expect('Content-Type', /json/)
+    .end(end)
+}
+
 function getAllVideosListBy (url, end) {
   const path = '/api/v1/videos'
 
@@ -205,6 +217,7 @@ function uploadVideo (url, accessToken, videoAttributesArg, specialStatus, end)
   let attributes = {
     name: 'my super video',
     category: 5,
+    licence: 4,
     description: 'my super description',
     tags: [ 'tag' ],
     fixture: 'video_short.webm'
@@ -217,6 +230,7 @@ function uploadVideo (url, accessToken, videoAttributesArg, specialStatus, end)
               .set('Authorization', 'Bearer ' + accessToken)
               .field('name', attributes.name)
               .field('category', attributes.category)
+              .field('licence', attributes.licence)
               .field('description', attributes.description)
 
   for (let i = 0; i < attributes.tags.length; i++) {
@@ -250,6 +264,7 @@ function updateVideo (url, accessToken, id, attributes, specialStatus, end) {
 
   if (attributes.name) req.field('name', attributes.name)
   if (attributes.category) req.field('category', attributes.category)
+  if (attributes.licence) req.field('licence', attributes.licence)
   if (attributes.description) req.field('description', attributes.description)
 
   if (attributes.tags) {