X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2FfriendsAdvanced.js;h=0d24481ef64c79676fbbbb45307bab08a5544796;hb=8d30905858245f12a42fc327d2d57cbfe062d548;hp=833a530ddc8b431ceec117e70e4bd870388bf658;hpb=bc503c2a62dcf9aed6b8d90b68f0f27a7755ac01;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/friendsAdvanced.js b/server/tests/api/friendsAdvanced.js
index 833a530dd..0d24481ef 100644
--- a/server/tests/api/friendsAdvanced.js
+++ b/server/tests/api/friendsAdvanced.js
@@ -1,48 +1,56 @@
 'use strict'
 
-const async = require('async')
 const chai = require('chai')
+const each = require('async/each')
 const expect = chai.expect
+const series = require('async/series')
 
-const utils = require('./utils')
+const loginUtils = require('../utils/login')
+const podsUtils = require('../utils/pods')
+const serversUtils = require('../utils/servers')
+const videosUtils = require('../utils/videos')
 
 describe('Test advanced friends', function () {
   let servers = []
 
   function makeFriends (podNumber, callback) {
-    return utils.makeFriends(servers[podNumber - 1].url, callback)
+    const server = servers[podNumber - 1]
+    return podsUtils.makeFriends(server.url, server.accessToken, callback)
   }
 
   function quitFriends (podNumber, callback) {
-    return utils.quitFriends(servers[podNumber - 1].url, callback)
+    const server = servers[podNumber - 1]
+    return podsUtils.quitFriends(server.url, server.accessToken, callback)
   }
 
   function getFriendsList (podNumber, end) {
-    return utils.getFriendsList(servers[podNumber - 1].url, end)
+    const server = servers[podNumber - 1]
+    return podsUtils.getFriendsList(server.url, end)
   }
 
   function uploadVideo (podNumber, callback) {
     const name = 'my super video'
     const description = 'my super description'
+    const tags = [ 'tag1', 'tag2' ]
     const fixture = 'video_short.webm'
     const server = servers[podNumber - 1]
 
-    return utils.uploadVideo(server.url, server.access_token, name, description, fixture, callback)
+    return videosUtils.uploadVideo(server.url, server.accessToken, name, description, tags, fixture, callback)
   }
 
   function getVideos (podNumber, callback) {
-    return utils.getVideosList(servers[podNumber - 1].url, callback)
+    return videosUtils.getVideosList(servers[podNumber - 1].url, callback)
   }
 
   // ---------------------------------------------------------------
 
   before(function (done) {
     this.timeout(30000)
-    utils.flushAndRunMultipleServers(6, function (serversRun, urlsRun) {
+    serversUtils.flushAndRunMultipleServers(6, function (serversRun, urlsRun) {
       servers = serversRun
 
-      async.each(servers, function (server, callbackEach) {
-        utils.loginAndGetAccessToken(server, function (err, accessToken) {
+      each(servers, function (server, callbackEach) {
+        loginUtils.loginAndGetAccessToken(server, function (err, accessToken) {
           if (err) return callbackEach(err)
 
           server.accessToken = accessToken
@@ -55,7 +63,7 @@ describe('Test advanced friends', function () {
   it('Should make friends with two pod each in a different group', function (done) {
     this.timeout(20000)
 
-    async.series([
+    series([
       // Pod 3 makes friend with the first one
       function (next) {
         makeFriends(3, next)
@@ -89,7 +97,7 @@ describe('Test advanced friends', function () {
   it('Should quit all friends', function (done) {
     this.timeout(10000)
 
-    async.series([
+    series([
       function (next) {
         quitFriends(1, next)
       },
@@ -99,7 +107,7 @@ describe('Test advanced friends', function () {
       function (err) {
         if (err) throw err
 
-        async.each([ 1, 2, 3, 4, 5, 6 ], function (i, callback) {
+        each([ 1, 2, 3, 4, 5, 6 ], function (i, callback) {
           getFriendsList(i, function (err, res) {
             if (err) throw err
 
@@ -115,7 +123,7 @@ describe('Test advanced friends', function () {
   it('Should make friends with the pods 1, 2, 3', function (done) {
     this.timeout(150000)
 
-    async.series([
+    series([
       // Pods 1, 2, 3 and 4 become friends
       function (next) {
         makeFriends(2, next)
@@ -126,6 +134,18 @@ describe('Test advanced friends', function () {
       function (next) {
         makeFriends(4, next)
       },
+      // Check the pods 1, 2, 3 and 4 are friends
+      function (next) {
+        each([ 1, 2, 3, 4 ], function (i, callback) {
+          getFriendsList(i, function (err, res) {
+            if (err) throw err
+
+            expect(res.body.length).to.equal(3)
+
+            callback()
+          })
+        }, next)
+      },
       // Kill pod 4
       function (next) {
         servers[3].app.kill()
@@ -148,11 +168,11 @@ describe('Test advanced friends', function () {
         uploadVideo(2, next)
       },
       function (next) {
-        setTimeout(next, 20000)
+        setTimeout(next, 11000)
       },
       // Rerun server 4
       function (next) {
-        utils.runServer(4, function (server) {
+        serversUtils.runServer(4, function (server) {
           servers[3].app = server.app
           next()
         })
@@ -169,6 +189,9 @@ describe('Test advanced friends', function () {
       // Pod 6 ask pod 1, 2 and 3
       function (next) {
         makeFriends(6, next)
+      },
+      function (next) {
+        setTimeout(next, 11000)
       }],
       function (err) {
         if (err) throw err
@@ -192,7 +215,7 @@ describe('Test advanced friends', function () {
   it('Should pod 1 quit friends', function (done) {
     this.timeout(25000)
 
-    async.series([
+    series([
       // Upload a video on server 3 for aditionnal tests
       function (next) {
         uploadVideo(3, next)
@@ -207,8 +230,10 @@ describe('Test advanced friends', function () {
       function (next) {
         getVideos(1, function (err, res) {
           if (err) throw err
-          expect(res.body).to.be.an('array')
-          expect(res.body.length).to.equal(2)
+
+          const videos = res.body.data
+          expect(videos).to.be.an('array')
+          expect(videos.length).to.equal(2)
 
           next()
         })
@@ -218,8 +243,10 @@ describe('Test advanced friends', function () {
 
         getVideos(2, function (err, res) {
           if (err) throw err
-          expect(res.body).to.be.an('array')
-          expect(res.body.length).to.equal(3)
+
+          const videos = res.body.data
+          expect(videos).to.be.an('array')
+          expect(videos.length).to.equal(3)
           done()
         })
       }
@@ -233,12 +260,13 @@ describe('Test advanced friends', function () {
         getVideos(1, function (err, res) {
           if (err) throw err
 
-          expect(res.body).to.be.an('array')
-          expect(res.body.length).to.equal(5)
+          const videos = res.body.data
+          expect(videos).to.be.an('array')
+          expect(videos.length).to.equal(5)
 
           done()
         })
-      }, 5000)
+      }, 11000)
     })
   })
 
@@ -248,7 +276,7 @@ describe('Test advanced friends', function () {
     })
 
     if (this.ok) {
-      utils.flushTests(done)
+      serversUtils.flushTests(done)
     } else {
       done()
     }