Fix test (#71)

[github/Chocobozzz/PeerTube.git] / server / tests / api / multiple-pods.js

diff --git a/server/tests/api/multiple-pods.js b/server/tests/api/multiple-pods.js
index eccc9ecef6494de6e3907562b12b870496212300..c3ee77f0c98f73d2b07b364679909c69bcdf58f3 100644 (file)
--- a/server/tests/api/multiple-pods.js
+++ b/server/tests/api/multiple-pods.js
@@ -22,7 +22,7 @@ describe('Test multiple pods', function () {
   const toRemove = []
 
   before(function (done) {
-    this.timeout(30000)
+    this.timeout(120000)
 
     series([
       // Run servers
@@ -76,16 +76,22 @@ describe('Test multiple pods', function () {
 
   describe('Should upload the video and propagate on each pod', function () {
     it('Should upload the video on pod 1 and propagate on each pod', function (done) {
+      // Pod 1 has video transcoding activated
       this.timeout(15000)
 
       series([
         function (next) {
-          const name = 'my super name for pod 1'
-          const category = 5
-          const description = 'my super description for pod 1'
-          const tags = [ 'tag1p1', 'tag2p1' ]
-          const file = 'video_short1.webm'
-          videosUtils.uploadVideo(servers[0].url, servers[0].accessToken, name, category, description, tags, file, next)
+          const videoAttributes = {
+            name: 'my super name for pod 1',
+            category: 5,
+            licence: 4,
+            language: 9,
+            nsfw: true,
+            description: 'my super description for pod 1',
+            tags: [ 'tag1p1', 'tag2p1' ],
+            fixture: 'video_short1.webm'
+          }
+          videosUtils.uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes, next)
         },
         function (next) {
           setTimeout(next, 11000)
@@ -107,6 +113,11 @@ 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.language).to.equal(9)
+              expect(video.languageLabel).to.equal('Japanese')
+              expect(video.nsfw).to.be.truthy
               expect(video.description).to.equal('my super description for pod 1')
               expect(video.podHost).to.equal('localhost:9001')
               expect(video.magnetUri).to.exist
@@ -142,19 +153,25 @@ describe('Test multiple pods', function () {
     })
 
     it('Should upload the video on pod 2 and propagate on each pod', function (done) {
-      this.timeout(15000)
+      this.timeout(60000)
 
       series([
         function (next) {
-          const name = 'my super name for pod 2'
-          const category = 4
-          const description = 'my super description for pod 2'
-          const tags = [ 'tag1p2', 'tag2p2', 'tag3p2' ]
-          const file = 'video_short2.webm'
-          videosUtils.uploadVideo(servers[1].url, servers[1].accessToken, name, category, description, tags, file, next)
+          const videoAttributes = {
+            name: 'my super name for pod 2',
+            category: 4,
+            licence: 3,
+            language: 11,
+            nsfw: true,
+            description: 'my super description for pod 2',
+            tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ],
+            fixture: 'video_short2.webm'
+          }
+          videosUtils.uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes, next)
         },
         function (next) {
-          setTimeout(next, 11000)
+          // Transcoding, so wait more that 22 seconds
+          setTimeout(next, 42000)
         }],
         // All pods should have this video
         function (err) {
@@ -173,6 +190,11 @@ 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.language).to.equal(11)
+              expect(video.languageLabel).to.equal('German')
+              expect(video.nsfw).to.be.falsy
               expect(video.description).to.equal('my super description for pod 2')
               expect(video.podHost).to.equal('localhost:9002')
               expect(video.magnetUri).to.exist
@@ -208,27 +230,37 @@ describe('Test multiple pods', function () {
     })
 
     it('Should upload two videos on pod 3 and propagate on each pod', function (done) {
-      this.timeout(30000)
+      this.timeout(45000)
 
       series([
         function (next) {
-          const name = 'my super name for pod 3'
-          const category = 6
-          const description = 'my super description for pod 3'
-          const tags = [ 'tag1p3' ]
-          const file = 'video_short3.webm'
-          videosUtils.uploadVideo(servers[2].url, servers[2].accessToken, name, category, description, tags, file, next)
+          const videoAttributes = {
+            name: 'my super name for pod 3',
+            category: 6,
+            licence: 5,
+            language: 11,
+            nsfw: true,
+            description: 'my super description for pod 3',
+            tags: [ 'tag1p3' ],
+            fixture: 'video_short3.webm'
+          }
+          videosUtils.uploadVideo(servers[2].url, servers[2].accessToken, videoAttributes, next)
         },
         function (next) {
-          const name = 'my super name for pod 3-2'
-          const category = 7
-          const description = 'my super description for pod 3-2'
-          const tags = [ 'tag2p3', 'tag3p3', 'tag4p3' ]
-          const file = 'video_short.webm'
-          videosUtils.uploadVideo(servers[2].url, servers[2].accessToken, name, category, description, tags, file, next)
+          const videoAttributes = {
+            name: 'my super name for pod 3-2',
+            category: 7,
+            licence: 6,
+            language: 12,
+            nsfw: false,
+            description: 'my super description for pod 3-2',
+            tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ],
+            fixture: 'video_short.webm'
+          }
+          videosUtils.uploadVideo(servers[2].url, servers[2].accessToken, videoAttributes, next)
         },
         function (next) {
-          setTimeout(next, 22000)
+          setTimeout(next, 33000)
         }],
         function (err) {
           if (err) throw err
@@ -257,6 +289,11 @@ 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.language).to.equal(11)
+              expect(video1.languageLabel).to.equal('German')
+              expect(video1.nsfw).to.be.truthy
               expect(video1.description).to.equal('my super description for pod 3')
               expect(video1.podHost).to.equal('localhost:9003')
               expect(video1.magnetUri).to.exist
@@ -269,6 +306,11 @@ 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.language).to.equal(12)
+              expect(video2.languageLabel).to.equal('Korean')
+              expect(video2.nsfw).to.be.falsy
               expect(video2.description).to.equal('my super description for pod 3-2')
               expect(video2.podHost).to.equal('localhost:9003')
               expect(video2.magnetUri).to.exist
@@ -614,12 +656,16 @@ describe('Test multiple pods', function () {
     it('Should update the video 3 by asking pod 3', function (done) {
       this.timeout(15000)
 
-      const name = 'my super video updated'
-      const category = 10
-      const description = 'my super description updated'
-      const tags = [ 'tagup1', 'tagup2' ]
-
-      videosUtils.updateVideo(servers[2].url, servers[2].accessToken, toRemove[0].id, name, category, description, tags, function (err) {
+      const attributes = {
+        name: 'my super video updated',
+        category: 10,
+        licence: 7,
+        language: 13,
+        nsfw: true,
+        description: 'my super description updated',
+        tags: [ 'tagup1', 'tagup2' ]
+      }
+      videosUtils.updateVideo(servers[2].url, servers[2].accessToken, toRemove[0].id, attributes, function (err) {
         if (err) throw err
 
         setTimeout(done, 11000)
@@ -644,6 +690,11 @@ 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.language).to.equal(13)
+          expect(videoUpdated.languageLabel).to.equal('French')
+          expect(videoUpdated.nsfw).to.be.truthy
           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