X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fupdate-host.ts;h=43fbaec305d8489322a1008546d3c3cdc78b26fc;hb=764b1a14fc494f2cfd7ea590d2f07b01df65c7ad;hp=b89e72ab76c68d51c60625da6c488ed73a0db7e7;hpb=240085d0056fd97ac3c7fa8fa4ce9bc32afc4d6e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index b89e72ab7..43fbaec30 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts @@ -1,56 +1,39 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import * as chai from 'chai' -import { VideoDetails } from '../../../shared/models/videos' -import { waitJobs } from '../utils/server/jobs' -import { addVideoCommentThread } from '../utils/videos/video-comments' +import { expect } from 'chai' import { - addVideoChannel, - createUser, - execCLI, - flushTests, - getEnvCli, - getVideo, - getVideoChannelsList, - getVideosList, + cleanupTests, + createSingleServer, killallServers, makeActivityPubGetRequest, parseTorrentVideo, - runServer, - ServerInfo, + PeerTubeServer, setAccessTokensToServers, - uploadVideo -} from '../utils' -import { getAccountsList } from '../utils/users/accounts' - -const expect = chai.expect + waitJobs +} from '@shared/extra-utils' describe('Test update host scripts', function () { - let server: ServerInfo + let server: PeerTubeServer before(async function () { this.timeout(60000) - await flushTests() - const overrideConfig = { webserver: { port: 9256 } } // Run server 2 to have transcoding enabled - server = await runServer(2, overrideConfig) + server = await createSingleServer(2, overrideConfig) await setAccessTokensToServers([ server ]) // Upload two videos for our needs - const videoAttributes = {} - const resVideo1 = await uploadVideo(server.url, server.accessToken, videoAttributes) - const video1UUID = resVideo1.body.video.uuid - await uploadVideo(server.url, server.accessToken, videoAttributes) + const { uuid: video1UUID } = await server.videos.upload() + await server.videos.upload() // Create a user - await createUser(server.url, server.accessToken, 'toto', 'coucou') + await server.users.create({ username: 'toto', password: 'coucou' }) // Create channel const videoChannel = { @@ -58,11 +41,11 @@ describe('Test update host scripts', function () { displayName: 'second video channel', description: 'super video channel description' } - await addVideoChannel(server.url, server.accessToken, videoChannel) + await server.channels.create({ attributes: videoChannel }) // Create comments const text = 'my super first comment' - await addVideoCommentThread(server.url, server.accessToken, video1UUID, text) + await server.comments.createThread({ videoId: video1UUID, text }) await waitJobs(server) }) @@ -70,41 +53,46 @@ describe('Test update host scripts', function () { it('Should run update host', async function () { this.timeout(30000) - killallServers([ server ]) + await killallServers([ server ]) // Run server with standard configuration - server = await runServer(2) + await server.run() - const env = getEnvCli(server) - await execCLI(`${env} npm run update-host`) + await server.cli.execWithEnv(`npm run update-host`) }) it('Should have updated videos url', async function () { - const res = await getVideosList(server.url) - expect(res.body.total).to.equal(2) + const { total, data } = await server.videos.list() + expect(total).to.equal(2) - for (const video of res.body.data) { + for (const video of data) { const { body } = await makeActivityPubGetRequest(server.url, '/videos/watch/' + video.uuid) expect(body.id).to.equal('http://localhost:9002/videos/watch/' + video.uuid) + + const videoDetails = await server.videos.get({ id: video.uuid }) + + expect(videoDetails.trackerUrls[0]).to.include(server.host) + expect(videoDetails.streamingPlaylists[0].playlistUrl).to.include(server.host) + expect(videoDetails.streamingPlaylists[0].segmentsSha256Url).to.include(server.host) } }) it('Should have updated video channels url', async function () { - const res = await getVideoChannelsList(server.url, 0, 5, '-name') - expect(res.body.total).to.equal(3) + const { data, total } = await server.channels.list({ sort: '-name' }) + expect(total).to.equal(3) - for (const channel of res.body.data) { + for (const channel of data) { const { body } = await makeActivityPubGetRequest(server.url, '/video-channels/' + channel.name) expect(body.id).to.equal('http://localhost:9002/video-channels/' + channel.name) } }) - it('Should have update accounts url', async function () { - const res = await getAccountsList(server.url) - expect(res.body.total).to.equal(3) + it('Should have updated accounts url', async function () { + const body = await server.accounts.list() + expect(body.total).to.equal(3) - for (const account of res.body.data) { + for (const account of body.data) { const usernameWithDomain = account.name const { body } = await makeActivityPubGetRequest(server.url, '/accounts/' + usernameWithDomain) @@ -112,36 +100,35 @@ describe('Test update host scripts', function () { } }) - it('Should update torrent hosts', async function () { + it('Should have updated torrent hosts', async function () { this.timeout(30000) - const res = await getVideosList(server.url) - const videos = res.body.data - expect(videos).to.have.lengthOf(2) + const { data } = await server.videos.list() + expect(data).to.have.lengthOf(2) - for (const video of videos) { - const res2 = await getVideo(server.url, video.id) - const videoDetails: VideoDetails = res2.body + for (const video of data) { + const videoDetails = await server.videos.get({ id: video.id }) + const files = videoDetails.files.concat(videoDetails.streamingPlaylists[0].files) - expect(videoDetails.files).to.have.lengthOf(4) + expect(files).to.have.lengthOf(8) - for (const file of videoDetails.files) { + for (const file of files) { expect(file.magnetUri).to.contain('localhost%3A9002%2Ftracker%2Fsocket') - expect(file.magnetUri).to.contain('localhost%3A9002%2Fstatic%2Fwebseed%2F') + expect(file.magnetUri).to.contain('localhost%3A9002%2Fstatic%2F') - const torrent = await parseTorrentVideo(server, videoDetails.uuid, file.resolution.id) + const torrent = await parseTorrentVideo(server, file) const announceWS = torrent.announce.find(a => a === 'ws://localhost:9002/tracker/socket') expect(announceWS).to.not.be.undefined const announceHttp = torrent.announce.find(a => a === 'http://localhost:9002/tracker/announce') expect(announceHttp).to.not.be.undefined - expect(torrent.urlList[0]).to.contain('http://localhost:9002/static/webseed') + expect(torrent.urlList[0]).to.contain('http://localhost:9002/static/') } } }) after(async function () { - killallServers([ server ]) + await cleanupTests([ server ]) }) })