X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fpeertube.ts;h=5ab07edb05b0c5faf0ad2c3f693fa3cd4a99d322;hb=078f17e6d90376050f43ce639e88e11869b49ee7;hp=15b6755f22d1338622944afcd77fd3d5abc75f6c;hpb=e669ff58736e919cbc300e1880d995006592fa0c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts index 15b6755f2..5ab07edb0 100644 --- a/server/tests/cli/peertube.ts +++ b/server/tests/cli/peertube.ts @@ -1,30 +1,36 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' import { expect } from 'chai' +import { Video, VideoDetails } from '../../../shared' import { - addVideoChannel, + areHttpImportTestsDisabled, buildAbsoluteFixturePath, cleanupTests, - createUser, doubleFollow, - execCLI, + CLICommand, + createUser, + doubleFollow, flushAndRunServer, - getEnvCli, getLocalIdByUUID, + getLocalIdByUUID, + getMyUserInformation, getVideo, getVideosList, - getVideosListWithToken, removeVideo, + ImportsCommand, + removeVideo, ServerInfo, - setAccessTokensToServers, uploadVideo, uploadVideoAndGetId, + setAccessTokensToServers, + testHelloWorldRegisteredSettings, + uploadVideoAndGetId, userLogin, waitJobs } from '../../../shared/extra-utils' -import { Video, VideoDetails } from '../../../shared' -import { getYoutubeVideoUrl } from '../../../shared/extra-utils/videos/video-imports' describe('Test CLI wrapper', function () { let server: ServerInfo let userAccessToken: string + let cliCommand: CLICommand + const cmd = 'node ./dist/server/tools/peertube.js' before(async function () { @@ -38,44 +44,58 @@ describe('Test CLI wrapper', function () { userAccessToken = await userLogin(server, { username: 'user_1', password: 'super_password' }) { - const args = { name: 'user_channel', displayName: 'User channel', support: 'super support text' } - await addVideoChannel(server.url, userAccessToken, args) + const attributes = { name: 'user_channel', displayName: 'User channel', support: 'super support text' } + await server.channelsCommand.create({ token: userAccessToken, attributes }) } + + cliCommand = server.cliCommand }) describe('Authentication and instance selection', function () { + it('Should get an access token', async function () { + const stdout = await cliCommand.execWithEnv(`${cmd} token --url ${server.url} --username user_1 --password super_password`) + const token = stdout.trim() + + const res = await getMyUserInformation(server.url, token) + expect(res.body.username).to.equal('user_1') + }) + it('Should display no selected instance', async function () { this.timeout(60000) - const env = getEnvCli(server) - const stdout = await execCLI(`${env} ${cmd} --help`) - + const stdout = await cliCommand.execWithEnv(`${cmd} --help`) expect(stdout).to.contain('no instance selected') }) it('Should add a user', async function () { this.timeout(60000) - const env = getEnvCli(server) - await execCLI(`${env} ${cmd} auth add -u ${server.url} -U user_1 -p super_password`) + await cliCommand.execWithEnv(`${cmd} auth add -u ${server.url} -U user_1 -p super_password`) }) - it('Should default to this user', async function () { + it('Should not fail to add a user if there is a slash at the end of the instance URL', async function () { this.timeout(60000) - const env = getEnvCli(server) - const stdout = await execCLI(`${env} ${cmd} --help`) + let fullServerURL = server.url + '/' + await cliCommand.execWithEnv(`${cmd} auth add -u ${fullServerURL} -U user_1 -p super_password`) + + fullServerURL = server.url + '/asdfasdf' + await cliCommand.execWithEnv(`${cmd} auth add -u ${fullServerURL} -U user_1 -p super_password`) + }) + + it('Should default to this user', async function () { + this.timeout(60000) + + const stdout = await cliCommand.execWithEnv(`${cmd} --help`) expect(stdout).to.contain(`instance ${server.url} selected`) }) it('Should remember the user', async function () { this.timeout(60000) - const env = getEnvCli(server) - const stdout = await execCLI(`${env} ${cmd} auth list`) - + const stdout = await cliCommand.execWithEnv(`${cmd} auth list`) expect(stdout).to.contain(server.url) }) }) @@ -85,13 +105,10 @@ describe('Test CLI wrapper', function () { it('Should upload a video', async function () { this.timeout(60000) - const env = getEnvCli(server) - const fixture = buildAbsoluteFixturePath('60fps_720p_small.mp4') - const params = `-f ${fixture} --video-name 'test upload' --channel-name user_channel --support 'support_text'` - await execCLI(`${env} ${cmd} upload ${params}`) + await cliCommand.execWithEnv(`${cmd} upload ${params}`) }) it('Should have the video uploaded', async function () { @@ -101,7 +118,7 @@ describe('Test CLI wrapper', function () { const videos: Video[] = res.body.data - const video: VideoDetails = (await getVideo(server.url, videos[ 0 ].uuid)).body + const video: VideoDetails = (await getVideo(server.url, videos[0].uuid)).body expect(video.name).to.equal('test upload') expect(video.support).to.equal('support_text') @@ -109,16 +126,17 @@ describe('Test CLI wrapper', function () { }) it('Should import a video', async function () { - this.timeout(60000) - - const env = getEnvCli(server) + if (areHttpImportTestsDisabled()) return - const params = `--target-url ${getYoutubeVideoUrl()} --channel-name user_channel` + this.timeout(60000) - await execCLI(`${env} ${cmd} import ${params}`) + const params = `--target-url ${ImportsCommand.getYoutubeVideoUrl()} --channel-name user_channel` + await cliCommand.execWithEnv(`${cmd} import ${params}`) }) it('Should have imported the video', async function () { + if (areHttpImportTestsDisabled()) return + this.timeout(60000) await waitJobs([ server ]) @@ -141,13 +159,13 @@ describe('Test CLI wrapper', function () { }) it('Should import and override some imported attributes', async function () { - this.timeout(60000) - - const env = getEnvCli(server) + if (areHttpImportTestsDisabled()) return - const params = `--target-url ${getYoutubeVideoUrl()} --channel-name user_channel --video-name toto --nsfw --support support` + this.timeout(60000) - await execCLI(`${env} ${cmd} import ${params}`) + const params = `--target-url ${ImportsCommand.getYoutubeVideoUrl()} ` + + `--channel-name user_channel --video-name toto --nsfw --support support` + await cliCommand.execWithEnv(`${cmd} import ${params}`) await waitJobs([ server ]) @@ -171,18 +189,14 @@ describe('Test CLI wrapper', function () { describe('Admin auth', function () { it('Should remove the auth user', async function () { - const env = getEnvCli(server) - - await execCLI(`${env} ${cmd} auth del ${server.url}`) - - const stdout = await execCLI(`${env} ${cmd} --help`) + await cliCommand.execWithEnv(`${cmd} auth del ${server.url}`) + const stdout = await cliCommand.execWithEnv(`${cmd} --help`) expect(stdout).to.contain('no instance selected') }) it('Should add the admin user', async function () { - const env = getEnvCli(server) - await execCLI(`${env} ${cmd} auth add -u ${server.url} -U root -p test${server.internalServerNumber}`) + await cliCommand.execWithEnv(`${cmd} auth add -u ${server.url} -U root -p test${server.internalServerNumber}`) }) }) @@ -191,20 +205,21 @@ describe('Test CLI wrapper', function () { it('Should install a plugin', async function () { this.timeout(60000) - const env = getEnvCli(server) - await execCLI(`${env} ${cmd} plugins install --npm-name peertube-plugin-hello-world`) + await cliCommand.execWithEnv(`${cmd} plugins install --npm-name peertube-plugin-hello-world`) + }) + + it('Should have registered settings', async function () { + await testHelloWorldRegisteredSettings(server) }) it('Should list installed plugins', async function () { - const env = getEnvCli(server) - const res = await execCLI(`${env} ${cmd} plugins list`) + const res = await cliCommand.execWithEnv(`${cmd} plugins list`) expect(res).to.contain('peertube-plugin-hello-world') }) it('Should uninstall the plugin', async function () { - const env = getEnvCli(server) - const res = await execCLI(`${env} ${cmd} plugins uninstall --npm-name peertube-plugin-hello-world`) + const res = await cliCommand.execWithEnv(`${cmd} plugins uninstall --npm-name peertube-plugin-hello-world`) expect(res).to.not.contain('peertube-plugin-hello-world') }) @@ -235,11 +250,8 @@ describe('Test CLI wrapper', function () { it('Should add a redundancy', async function () { this.timeout(60000) - const env = getEnvCli(server) - const params = `add --video ${video1Server2}` - - await execCLI(`${env} ${cmd} redundancy ${params}`) + await cliCommand.execWithEnv(`${cmd} redundancy ${params}`) await waitJobs(servers) }) @@ -248,10 +260,8 @@ describe('Test CLI wrapper', function () { this.timeout(60000) { - const env = getEnvCli(server) - - const params = `list-my-redundancies` - const stdout = await execCLI(`${env} ${cmd} redundancy ${params}`) + const params = 'list-my-redundancies' + const stdout = await cliCommand.execWithEnv(`${cmd} redundancy ${params}`) expect(stdout).to.contain('super video') expect(stdout).to.contain(`localhost:${server.port}`) @@ -261,18 +271,14 @@ describe('Test CLI wrapper', function () { it('Should remove a redundancy', async function () { this.timeout(60000) - const env = getEnvCli(server) - const params = `remove --video ${video1Server2}` - - await execCLI(`${env} ${cmd} redundancy ${params}`) + await cliCommand.execWithEnv(`${cmd} redundancy ${params}`) await waitJobs(servers) { - const env = getEnvCli(server) - const params = `list-my-redundancies` - const stdout = await execCLI(`${env} ${cmd} redundancy ${params}`) + const params = 'list-my-redundancies' + const stdout = await cliCommand.execWithEnv(`${cmd} redundancy ${params}`) expect(stdout).to.not.contain('super video') }