Add createdDate to videos

[github/Chocobozzz/PeerTube.git] / server / tests / api / multiplePods.js

diff --git a/server/tests/api/multiplePods.js b/server/tests/api/multiplePods.js
index b361e373bed0b45d24d7c076bf487dfa381e2a2d..c31c18b0254125dfe9d7391e0761986eabcf49f7 100644 (file)
--- a/server/tests/api/multiplePods.js
+++ b/server/tests/api/multiplePods.js
@@ -11,7 +11,7 @@ webtorrent.silent = true
 
 describe('Test multiple pods', function () {
   let servers = []
-  const to_remove = []
+  const toRemove = []
 
   before(function (done) {
     this.timeout(30000)
@@ -19,25 +19,26 @@ describe('Test multiple pods', function () {
     async.series([
       // Run servers
       function (next) {
-        utils.flushAndRunMultipleServers(3, function (servers_run) {
-          servers = servers_run
+        utils.flushAndRunMultipleServers(3, function (serversRun) {
+          servers = serversRun
           next()
         })
       },
       // Get the access tokens
       function (next) {
-        async.each(servers, function (server, callback_each) {
-          utils.loginAndGetAccessToken(server, function (err, access_token) {
-            if (err) return callback_each(err)
+        async.each(servers, function (server, callbackEach) {
+          utils.loginAndGetAccessToken(server, function (err, accessToken) {
+            if (err) return callbackEach(err)
 
-            server.access_token = access_token
-            callback_each()
+            server.accessToken = accessToken
+            callbackEach()
           })
         }, next)
       },
       // The second pod make friend with the third
       function (next) {
-        utils.makeFriends(servers[1].url, next)
+        const server = servers[1]
+        utils.makeFriends(server.url, server.accessToken, next)
       },
       // Wait for the request between pods
       function (next) {
@@ -45,7 +46,8 @@ describe('Test multiple pods', function () {
       },
       // Pod 1 make friends too
       function (next) {
-        utils.makeFriends(servers[0].url, next)
+        const server = servers[0]
+        utils.makeFriends(server.url, server.accessToken, next)
       },
       function (next) {
         webtorrent.create({ host: 'client', port: '1' }, next)
@@ -72,7 +74,7 @@ describe('Test multiple pods', function () {
 
       async.series([
         function (next) {
-          utils.uploadVideo(servers[0].url, servers[0].access_token, 'my super name for pod 1', 'my super description for pod 1', 'video_short1.webm', next)
+          utils.uploadVideo(servers[0].url, servers[0].accessToken, 'my super name for pod 1', 'my super description for pod 1', 'video_short1.webm', next)
         },
         function (next) {
           setTimeout(next, 11000)
@@ -82,7 +84,7 @@ describe('Test multiple pods', function () {
           if (err) throw err
 
           async.each(servers, function (server, callback) {
-            let base_magnet = null
+            let baseMagnet = null
 
             utils.getVideosList(server.url, function (err, res) {
               if (err) throw err
@@ -96,6 +98,7 @@ describe('Test multiple pods', function () {
               expect(video.podUrl).to.equal('http://localhost:9001')
               expect(video.magnetUri).to.exist
               expect(video.duration).to.equal(10)
+              expect(utils.dateIsValid(video.createdDate)).to.be.true
 
               if (server.url !== 'http://localhost:9001') {
                 expect(video.isLocal).to.be.false
@@ -104,8 +107,8 @@ describe('Test multiple pods', function () {
               }
 
               // All pods should have the same magnet Uri
-              if (base_magnet === null) {
-                base_magnet = video.magnetUri
+              if (baseMagnet === null) {
+                baseMagnet = video.magnetUri
               } else {
                 expect(video.magnetUri).to.equal.magnetUri
               }
@@ -127,7 +130,7 @@ describe('Test multiple pods', function () {
 
       async.series([
         function (next) {
-          utils.uploadVideo(servers[1].url, servers[1].access_token, 'my super name for pod 2', 'my super description for pod 2', 'video_short2.webm', next)
+          utils.uploadVideo(servers[1].url, servers[1].accessToken, 'my super name for pod 2', 'my super description for pod 2', 'video_short2.webm', next)
         },
         function (next) {
           setTimeout(next, 11000)
@@ -137,7 +140,7 @@ describe('Test multiple pods', function () {
           if (err) throw err
 
           async.each(servers, function (server, callback) {
-            let base_magnet = null
+            let baseMagnet = null
 
             utils.getVideosList(server.url, function (err, res) {
               if (err) throw err
@@ -151,6 +154,7 @@ describe('Test multiple pods', function () {
               expect(video.podUrl).to.equal('http://localhost:9002')
               expect(video.magnetUri).to.exist
               expect(video.duration).to.equal(5)
+              expect(utils.dateIsValid(video.createdDate)).to.be.true
 
               if (server.url !== 'http://localhost:9002') {
                 expect(video.isLocal).to.be.false
@@ -159,8 +163,8 @@ describe('Test multiple pods', function () {
               }
 
               // All pods should have the same magnet Uri
-              if (base_magnet === null) {
-                base_magnet = video.magnetUri
+              if (baseMagnet === null) {
+                baseMagnet = video.magnetUri
               } else {
                 expect(video.magnetUri).to.equal.magnetUri
               }
@@ -182,10 +186,10 @@ describe('Test multiple pods', function () {
 
       async.series([
         function (next) {
-          utils.uploadVideo(servers[2].url, servers[2].access_token, 'my super name for pod 3', 'my super description for pod 3', 'video_short3.webm', next)
+          utils.uploadVideo(servers[2].url, servers[2].accessToken, 'my super name for pod 3', 'my super description for pod 3', 'video_short3.webm', next)
         },
         function (next) {
-          utils.uploadVideo(servers[2].url, servers[2].access_token, 'my super name for pod 3-2', 'my super description for pod 3-2', 'video_short.webm', next)
+          utils.uploadVideo(servers[2].url, servers[2].accessToken, 'my super name for pod 3-2', 'my super description for pod 3-2', 'video_short.webm', next)
         },
         function (next) {
           setTimeout(next, 22000)
@@ -193,7 +197,7 @@ describe('Test multiple pods', function () {
         function (err) {
           if (err) throw err
 
-          let base_magnet = null
+          let baseMagnet = null
           // All pods should have this video
           async.each(servers, function (server, callback) {
             utils.getVideosList(server.url, function (err, res) {
@@ -219,12 +223,14 @@ describe('Test multiple pods', function () {
               expect(video1.podUrl).to.equal('http://localhost:9003')
               expect(video1.magnetUri).to.exist
               expect(video1.duration).to.equal(5)
+              expect(utils.dateIsValid(video1.createdDate)).to.be.true
 
               expect(video2.name).to.equal('my super name for pod 3-2')
               expect(video2.description).to.equal('my super description for pod 3-2')
               expect(video2.podUrl).to.equal('http://localhost:9003')
               expect(video2.magnetUri).to.exist
               expect(video2.duration).to.equal(5)
+              expect(utils.dateIsValid(video2.createdDate)).to.be.true
 
               if (server.url !== 'http://localhost:9003') {
                 expect(video1.isLocal).to.be.false
@@ -235,8 +241,8 @@ describe('Test multiple pods', function () {
               }
 
               // All pods should have the same magnet Uri
-              if (base_magnet === null) {
-                base_magnet = video2.magnetUri
+              if (baseMagnet === null) {
+                baseMagnet = video2.magnetUri
               } else {
                 expect(video2.magnetUri).to.equal.magnetUri
               }
@@ -268,8 +274,8 @@ describe('Test multiple pods', function () {
         if (err) throw err
 
         const video = res.body[0]
-        to_remove.push(res.body[2].id)
-        to_remove.push(res.body[3].id)
+        toRemove.push(res.body[2].id)
+        toRemove.push(res.body[3].id)
 
         webtorrent.add(video.magnetUri, function (torrent) {
           expect(torrent.files).to.exist
@@ -314,7 +320,7 @@ describe('Test multiple pods', function () {
           expect(torrent.files.length).to.equal(1)
           expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-          done()
+          webtorrent.remove(video.magnetUri, done)
         })
       })
     })
@@ -343,10 +349,10 @@ describe('Test multiple pods', function () {
 
       async.series([
         function (next) {
-          utils.removeVideo(servers[2].url, servers[2].access_token, to_remove[0], next)
+          utils.removeVideo(servers[2].url, servers[2].accessToken, toRemove[0], next)
         },
         function (next) {
-          utils.removeVideo(servers[2].url, servers[2].access_token, to_remove[1], next)
+          utils.removeVideo(servers[2].url, servers[2].accessToken, toRemove[1], next)
         }],
         function (err) {
           if (err) throw err
@@ -364,10 +370,10 @@ describe('Test multiple pods', function () {
           expect(videos).to.be.an('array')
           expect(videos.length).to.equal(2)
           expect(videos[0].id).not.to.equal(videos[1].id)
-          expect(videos[0].id).not.to.equal(to_remove[0])
-          expect(videos[1].id).not.to.equal(to_remove[0])
-          expect(videos[0].id).not.to.equal(to_remove[1])
-          expect(videos[1].id).not.to.equal(to_remove[1])
+          expect(videos[0].id).not.to.equal(toRemove[0])
+          expect(videos[1].id).not.to.equal(toRemove[0])
+          expect(videos[0].id).not.to.equal(toRemove[1])
+          expect(videos[1].id).not.to.equal(toRemove[1])
 
           callback()
         })