X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2FmultiplePods.js;h=dac6dd4107cda8f6719cb667ffbdda1ec43ca8c5;hb=68ce3ae021c9bc11b155044df6d23ba60e91eee4;hp=1a61034fc4c7bd7bb86c06e927142ade415269fd;hpb=b6c6f935d4eb3692cfd7f79a66cc40e0fef69256;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/multiplePods.js b/server/tests/api/multiplePods.js index 1a61034fc..dac6dd410 100644 --- a/server/tests/api/multiplePods.js +++ b/server/tests/api/multiplePods.js @@ -37,7 +37,8 @@ describe('Test multiple pods', function () { }, // 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) @@ -58,8 +60,9 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - expect(res.body).to.be.an('array') - expect(res.body.length).to.equal(0) + const videos = res.body.data + expect(videos).to.be.an('array') + expect(videos.length).to.equal(0) callback() }) @@ -87,15 +90,16 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(1) const video = videos[0] expect(video.name).to.equal('my super name for pod 1') expect(video.description).to.equal('my super description for pod 1') - expect(video.podUrl).to.equal('http://localhost:9001') + expect(video.podUrl).to.equal('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 @@ -142,15 +146,16 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(2) const video = videos[1] expect(video.name).to.equal('my super name for pod 2') expect(video.description).to.equal('my super description for pod 2') - expect(video.podUrl).to.equal('http://localhost:9002') + expect(video.podUrl).to.equal('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 @@ -199,7 +204,7 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(4) @@ -216,15 +221,17 @@ describe('Test multiple pods', function () { expect(video1.name).to.equal('my super name for pod 3') expect(video1.description).to.equal('my super description for pod 3') - expect(video1.podUrl).to.equal('http://localhost:9003') + expect(video1.podUrl).to.equal('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.podUrl).to.equal('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 @@ -267,9 +274,9 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[2].url, function (err, res) { if (err) throw err - const video = res.body[0] - toRemove.push(res.body[2].id) - toRemove.push(res.body[3].id) + const video = res.body.data[0] + toRemove.push(res.body.data[2].id) + toRemove.push(res.body.data[3].id) webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist @@ -288,7 +295,7 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[0].url, function (err, res) { if (err) throw err - const video = res.body[1] + const video = res.body.data[1] webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist @@ -307,14 +314,14 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[1].url, function (err, res) { if (err) throw err - const video = res.body[2] + const video = res.body.data[2] webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist expect(torrent.files.length).to.equal(1) expect(torrent.files[0].path).to.exist.and.to.not.equal('') - done() + webtorrent.remove(video.magnetUri, done) }) }) }) @@ -326,7 +333,7 @@ describe('Test multiple pods', function () { utils.getVideosList(servers[0].url, function (err, res) { if (err) throw err - const video = res.body[3] + const video = res.body.data[3] webtorrent.add(video.magnetUri, function (torrent) { expect(torrent.files).to.exist @@ -360,7 +367,7 @@ describe('Test multiple pods', function () { utils.getVideosList(server.url, function (err, res) { if (err) throw err - const videos = res.body + const videos = res.body.data expect(videos).to.be.an('array') expect(videos.length).to.equal(2) expect(videos[0].id).not.to.equal(videos[1].id)