Fix friends making

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

diff --git a/server/tests/api/friendsAdvanced.js b/server/tests/api/friendsAdvanced.js
index 9838d890ffdc431143b37b159bed60b9fbbe5434..833a530ddc8b431ceec117e70e4bd870388bf658 100644 (file)
--- a/server/tests/api/friendsAdvanced.js
+++ b/server/tests/api/friendsAdvanced.js
@@ -1,47 +1,54 @@
 'use strict'
 
-var async = require('async')
-var chai = require('chai')
-var expect = chai.expect
+const async = require('async')
+const chai = require('chai')
+const expect = chai.expect
 
-var utils = require('./utils')
+const utils = require('./utils')
 
 describe('Test advanced friends', function () {
-  var apps = []
-  var urls = []
+  let servers = []
 
-  function makeFriends (pod_number, callback) {
-    return utils.makeFriends(urls[pod_number - 1], callback)
+  function makeFriends (podNumber, callback) {
+    return utils.makeFriends(servers[podNumber - 1].url, callback)
   }
 
-  function quitFriends (pod_number, callback) {
-    return utils.quitFriends(urls[pod_number - 1], callback)
+  function quitFriends (podNumber, callback) {
+    return utils.quitFriends(servers[podNumber - 1].url, callback)
   }
 
-  function getFriendsList (pod_number, end) {
-    return utils.getFriendsList(urls[pod_number - 1], end)
+  function getFriendsList (podNumber, end) {
+    return utils.getFriendsList(servers[podNumber - 1].url, end)
   }
 
-  function uploadVideo (pod_number, callback) {
-    var name = 'my super video'
-    var description = 'my super description'
-    var fixture = 'video_short.webm'
+  function uploadVideo (podNumber, callback) {
+    const name = 'my super video'
+    const description = 'my super description'
+    const fixture = 'video_short.webm'
+    const server = servers[podNumber - 1]
 
-    return utils.uploadVideo(urls[pod_number - 1], name, description, fixture, callback)
+    return utils.uploadVideo(server.url, server.access_token, name, description, fixture, callback)
   }
 
-  function getVideos (pod_number, callback) {
-    return utils.getVideosList(urls[pod_number - 1], callback)
+  function getVideos (podNumber, callback) {
+    return utils.getVideosList(servers[podNumber - 1].url, callback)
   }
 
   // ---------------------------------------------------------------
 
   before(function (done) {
     this.timeout(30000)
-    utils.flushAndRunMultipleServers(6, function (apps_run, urls_run) {
-      apps = apps_run
-      urls = urls_run
-      done()
+    utils.flushAndRunMultipleServers(6, function (serversRun, urlsRun) {
+      servers = serversRun
+
+      async.each(servers, function (server, callbackEach) {
+        utils.loginAndGetAccessToken(server, function (err, accessToken) {
+          if (err) return callbackEach(err)
+
+          server.accessToken = accessToken
+          callbackEach()
+        })
+      }, done)
     })
   })
 
@@ -121,7 +128,7 @@ describe('Test advanced friends', function () {
       },
       // Kill pod 4
       function (next) {
-        apps[3].kill()
+        servers[3].app.kill()
         next()
       },
       // Expulse pod 4 from pod 1 and 2
@@ -145,8 +152,8 @@ describe('Test advanced friends', function () {
       },
       // Rerun server 4
       function (next) {
-        utils.runServer(4, function (app, url) {
-          apps[3] = app
+        utils.runServer(4, function (server) {
+          servers[3].app = server.app
           next()
         })
       },
@@ -156,7 +163,6 @@ describe('Test advanced friends', function () {
 
           // Pod 4 didn't know pod 1 and 2 removed it
           expect(res.body.length).to.equal(3)
-
           next()
         })
       },
@@ -171,10 +177,10 @@ describe('Test advanced friends', function () {
           if (err) throw err
 
           // Pod 4 should not be our friend
-          var result = res.body
+          const result = res.body
           expect(result.length).to.equal(3)
-          for (var pod of result) {
-            expect(pod.url).not.equal(urls[3])
+          for (const pod of result) {
+            expect(pod.url).not.equal(servers[3].url)
           }
 
           done()
@@ -237,8 +243,8 @@ describe('Test advanced friends', function () {
   })
 
   after(function (done) {
-    apps.forEach(function (app) {
-      process.kill(-app.pid)
+    servers.forEach(function (server) {
+      process.kill(-server.app.pid)
     })
 
     if (this.ok) {