X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fpods.js;h=cdabb64a63b04c9ff28c543bc3b0cf6311ca59b4;hb=d5f5a670fcf6258d0facf9a2fd3aabd550fbc78f;hp=9a9148856bd4c0850854c6d3a417d0d046f5af4e;hpb=1e2564d3927ce4ca4ca9a09930da6da7ebb4e9a1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/utils/pods.js b/server/tests/utils/pods.js index 9a9148856..cdabb64a6 100644 --- a/server/tests/utils/pods.js +++ b/server/tests/utils/pods.js @@ -3,9 +3,10 @@ const request = require('supertest') const podsUtils = { - getFriendsList: getFriendsList, - makeFriends: makeFriends, - quitFriends: quitFriends + getFriendsList, + makeFriends, + quitFriends, + quitOneFriend } // ---------------------- Export functions -------------------- @@ -30,25 +31,25 @@ function makeFriends (url, accessToken, expectedStatus, end) { // Which pod makes friends with which pod const friendsMatrix = { 'http://localhost:9001': [ - 'http://localhost:9002' + 'localhost:9002' ], 'http://localhost:9002': [ - 'http://localhost:9003' + 'localhost:9003' ], 'http://localhost:9003': [ - 'http://localhost:9001' + 'localhost:9001' ], 'http://localhost:9004': [ - 'http://localhost:9002' + 'localhost:9002' ], 'http://localhost:9005': [ - 'http://localhost:9001', - 'http://localhost:9004' + 'localhost:9001', + 'localhost:9004' ], 'http://localhost:9006': [ - 'http://localhost:9001', - 'http://localhost:9002', - 'http://localhost:9003' + 'localhost:9001', + 'localhost:9002', + 'localhost:9003' ] } const path = '/api/v1/pods/makefriends' @@ -58,7 +59,7 @@ function makeFriends (url, accessToken, expectedStatus, end) { .post(path) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + accessToken) - .send({ 'urls': friendsMatrix[url] }) + .send({ 'hosts': friendsMatrix[url] }) .expect(expectedStatus) .end(function (err, res) { if (err) throw err @@ -90,6 +91,26 @@ function quitFriends (url, accessToken, expectedStatus, end) { }) } +function quitOneFriend (url, accessToken, friendId, expectedStatus, end) { + if (!end) { + end = expectedStatus + expectedStatus = 204 + } + + const path = '/api/v1/pods/' + friendId + + request(url) + .delete(path) + .set('Accept', 'application/json') + .set('Authorization', 'Bearer ' + accessToken) + .expect(expectedStatus) + .end(function (err, res) { + if (err) throw err + + end() + }) +} + // --------------------------------------------------------------------------- module.exports = podsUtils