diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-11-14 20:45:00 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-11-16 20:29:26 +0100 |
commit | a4254ea1738d3b963fd4ccb995ab63f70656d6c0 (patch) | |
tree | 5b86f5111b9ff764e41285198c15b5c24d4648f4 /server/tests/utils | |
parent | 49abbbbedca83b9031d3e2eb3ae9ad9b6a7d96ed (diff) | |
download | PeerTube-a4254ea1738d3b963fd4ccb995ab63f70656d6c0.tar.gz PeerTube-a4254ea1738d3b963fd4ccb995ab63f70656d6c0.tar.zst PeerTube-a4254ea1738d3b963fd4ccb995ab63f70656d6c0.zip |
Server: adapt tests to host
Diffstat (limited to 'server/tests/utils')
-rw-r--r-- | server/tests/utils/pods.js | 20 | ||||
-rw-r--r-- | server/tests/utils/servers.js | 1 |
2 files changed, 11 insertions, 10 deletions
diff --git a/server/tests/utils/pods.js b/server/tests/utils/pods.js index a8551a49d..25b97edec 100644 --- a/server/tests/utils/pods.js +++ b/server/tests/utils/pods.js | |||
@@ -30,25 +30,25 @@ function makeFriends (url, accessToken, expectedStatus, end) { | |||
30 | // Which pod makes friends with which pod | 30 | // Which pod makes friends with which pod |
31 | const friendsMatrix = { | 31 | const friendsMatrix = { |
32 | 'http://localhost:9001': [ | 32 | 'http://localhost:9001': [ |
33 | 'http://localhost:9002' | 33 | 'localhost:9002' |
34 | ], | 34 | ], |
35 | 'http://localhost:9002': [ | 35 | 'http://localhost:9002': [ |
36 | 'http://localhost:9003' | 36 | 'localhost:9003' |
37 | ], | 37 | ], |
38 | 'http://localhost:9003': [ | 38 | 'http://localhost:9003': [ |
39 | 'http://localhost:9001' | 39 | 'localhost:9001' |
40 | ], | 40 | ], |
41 | 'http://localhost:9004': [ | 41 | 'http://localhost:9004': [ |
42 | 'http://localhost:9002' | 42 | 'localhost:9002' |
43 | ], | 43 | ], |
44 | 'http://localhost:9005': [ | 44 | 'http://localhost:9005': [ |
45 | 'http://localhost:9001', | 45 | 'localhost:9001', |
46 | 'http://localhost:9004' | 46 | 'localhost:9004' |
47 | ], | 47 | ], |
48 | 'http://localhost:9006': [ | 48 | 'http://localhost:9006': [ |
49 | 'http://localhost:9001', | 49 | 'localhost:9001', |
50 | 'http://localhost:9002', | 50 | 'localhost:9002', |
51 | 'http://localhost:9003' | 51 | 'localhost:9003' |
52 | ] | 52 | ] |
53 | } | 53 | } |
54 | const path = '/api/v1/pods/makefriends' | 54 | const path = '/api/v1/pods/makefriends' |
@@ -58,7 +58,7 @@ function makeFriends (url, accessToken, expectedStatus, end) { | |||
58 | .post(path) | 58 | .post(path) |
59 | .set('Accept', 'application/json') | 59 | .set('Accept', 'application/json') |
60 | .set('Authorization', 'Bearer ' + accessToken) | 60 | .set('Authorization', 'Bearer ' + accessToken) |
61 | .send({ 'urls': friendsMatrix[url] }) | 61 | .send({ 'hosts': friendsMatrix[url] }) |
62 | .expect(expectedStatus) | 62 | .expect(expectedStatus) |
63 | .end(function (err, res) { | 63 | .end(function (err, res) { |
64 | if (err) throw err | 64 | if (err) throw err |
diff --git a/server/tests/utils/servers.js b/server/tests/utils/servers.js index d62838bc7..01c9a2f39 100644 --- a/server/tests/utils/servers.js +++ b/server/tests/utils/servers.js | |||
@@ -47,6 +47,7 @@ function runServer (number, callback) { | |||
47 | const server = { | 47 | const server = { |
48 | app: null, | 48 | app: null, |
49 | url: `http://localhost:${9000 + number}`, | 49 | url: `http://localhost:${9000 + number}`, |
50 | host: `localhost:${9000 + number}`, | ||
50 | client: { | 51 | client: { |
51 | id: null, | 52 | id: null, |
52 | secret: null | 53 | secret: null |