X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fconfig.ts;h=e5bab0b7721bd332e319865d7826bc01bd4d221e;hb=1896bca09e088b0da9d5e845407ecebae330618c;hp=a494858b3a50ee0cacfe6685e105fa7a7415a0f9;hpb=d7a25329f9e607894d29ab342b9cb66638b56dc0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index a494858b3..e5bab0b77 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts @@ -1,4 +1,4 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' import * as chai from 'chai' @@ -11,21 +11,24 @@ import { getAbout, getConfig, getCustomConfig, - killallServers, parallelTests, + killallServers, + parallelTests, registerUser, - reRunServer, ServerInfo, + reRunServer, + ServerInfo, setAccessTokensToServers, - updateCustomConfig, uploadVideo + updateCustomConfig, + uploadVideo } from '../../../../shared/extra-utils' import { ServerConfig } from '../../../../shared/models' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' const expect = chai.expect function checkInitialConfig (server: ServerInfo, data: CustomConfig) { expect(data.instance.name).to.equal('PeerTube') expect(data.instance.shortDescription).to.equal( - 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' + - 'with WebTorrent and Angular.' + 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.' ) expect(data.instance.description).to.equal('Welcome to this PeerTube instance!') @@ -62,19 +65,38 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) { expect(data.user.videoQuota).to.equal(5242880) expect(data.user.videoQuotaDaily).to.equal(-1) + expect(data.transcoding.enabled).to.be.false expect(data.transcoding.allowAdditionalExtensions).to.be.false expect(data.transcoding.allowAudioFiles).to.be.false expect(data.transcoding.threads).to.equal(2) + expect(data.transcoding.profile).to.equal('default') expect(data.transcoding.resolutions['240p']).to.be.true expect(data.transcoding.resolutions['360p']).to.be.true expect(data.transcoding.resolutions['480p']).to.be.true expect(data.transcoding.resolutions['720p']).to.be.true expect(data.transcoding.resolutions['1080p']).to.be.true + expect(data.transcoding.resolutions['1440p']).to.be.true expect(data.transcoding.resolutions['2160p']).to.be.true expect(data.transcoding.webtorrent.enabled).to.be.true expect(data.transcoding.hls.enabled).to.be.true + expect(data.live.enabled).to.be.false + expect(data.live.allowReplay).to.be.false + expect(data.live.maxDuration).to.equal(-1) + expect(data.live.maxInstanceLives).to.equal(20) + expect(data.live.maxUserLives).to.equal(3) + expect(data.live.transcoding.enabled).to.be.false + expect(data.live.transcoding.threads).to.equal(2) + expect(data.live.transcoding.profile).to.equal('default') + expect(data.live.transcoding.resolutions['240p']).to.be.false + expect(data.live.transcoding.resolutions['360p']).to.be.false + expect(data.live.transcoding.resolutions['480p']).to.be.false + expect(data.live.transcoding.resolutions['720p']).to.be.false + expect(data.live.transcoding.resolutions['1080p']).to.be.false + expect(data.live.transcoding.resolutions['1440p']).to.be.false + expect(data.live.transcoding.resolutions['2160p']).to.be.false + expect(data.import.videos.http.enabled).to.be.true expect(data.import.videos.torrent.enabled).to.be.true expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.false @@ -84,7 +106,12 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) { expect(data.followings.instance.autoFollowBack.enabled).to.be.false expect(data.followings.instance.autoFollowIndex.enabled).to.be.false - expect(data.followings.instance.autoFollowIndex.indexUrl).to.equal('https://instances.joinpeertube.org') + expect(data.followings.instance.autoFollowIndex.indexUrl).to.equal('') + + expect(data.broadcastMessage.enabled).to.be.false + expect(data.broadcastMessage.level).to.equal('info') + expect(data.broadcastMessage.message).to.equal('') + expect(data.broadcastMessage.dismissable).to.be.false } function checkUpdatedConfig (data: CustomConfig) { @@ -134,6 +161,7 @@ function checkUpdatedConfig (data: CustomConfig) { expect(data.transcoding.threads).to.equal(1) expect(data.transcoding.allowAdditionalExtensions).to.be.true expect(data.transcoding.allowAudioFiles).to.be.true + expect(data.transcoding.profile).to.equal('vod_profile') expect(data.transcoding.resolutions['240p']).to.be.false expect(data.transcoding.resolutions['360p']).to.be.true expect(data.transcoding.resolutions['480p']).to.be.true @@ -143,6 +171,21 @@ function checkUpdatedConfig (data: CustomConfig) { expect(data.transcoding.hls.enabled).to.be.false expect(data.transcoding.webtorrent.enabled).to.be.true + expect(data.live.enabled).to.be.true + expect(data.live.allowReplay).to.be.true + expect(data.live.maxDuration).to.equal(5000) + expect(data.live.maxInstanceLives).to.equal(-1) + expect(data.live.maxUserLives).to.equal(10) + expect(data.live.transcoding.enabled).to.be.true + expect(data.live.transcoding.threads).to.equal(4) + expect(data.live.transcoding.profile).to.equal('live_profile') + expect(data.live.transcoding.resolutions['240p']).to.be.true + expect(data.live.transcoding.resolutions['360p']).to.be.true + expect(data.live.transcoding.resolutions['480p']).to.be.true + expect(data.live.transcoding.resolutions['720p']).to.be.true + expect(data.live.transcoding.resolutions['1080p']).to.be.true + expect(data.live.transcoding.resolutions['2160p']).to.be.true + expect(data.import.videos.http.enabled).to.be.false expect(data.import.videos.torrent.enabled).to.be.false expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.true @@ -153,6 +196,11 @@ function checkUpdatedConfig (data: CustomConfig) { expect(data.followings.instance.autoFollowBack.enabled).to.be.true expect(data.followings.instance.autoFollowIndex.enabled).to.be.true expect(data.followings.instance.autoFollowIndex.indexUrl).to.equal('https://updated.example.com') + + expect(data.broadcastMessage.enabled).to.be.true + expect(data.broadcastMessage.level).to.equal('error') + expect(data.broadcastMessage.message).to.equal('super bad message') + expect(data.broadcastMessage.dismissable).to.be.true } describe('Test config', function () { @@ -196,8 +244,8 @@ describe('Test config', function () { expect(data.video.file.extensions).to.contain('.webm') expect(data.video.file.extensions).to.contain('.ogv') - await uploadVideo(server.url, server.accessToken, { fixture: 'video_short.mkv' }, 400) - await uploadVideo(server.url, server.accessToken, { fixture: 'sample.ogg' }, 400) + await uploadVideo(server.url, server.accessToken, { fixture: 'video_short.mkv' }, HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) + await uploadVideo(server.url, server.accessToken, { fixture: 'sample.ogg' }, HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) expect(data.contactForm.enabled).to.be.true }) @@ -228,9 +276,11 @@ describe('Test config', function () { languages: [ 'en', 'es' ], categories: [ 1, 2 ], - defaultClientRoute: '/videos/recently-added', isNSFW: true, defaultNSFWPolicy: 'blur' as 'blur', + + defaultClientRoute: '/videos/recently-added', + customizations: { javascript: 'alert("coucou")', css: 'body { background-color: red; }' @@ -273,12 +323,15 @@ describe('Test config', function () { allowAdditionalExtensions: true, allowAudioFiles: true, threads: 1, + profile: 'vod_profile', resolutions: { + '0p': false, '240p': false, '360p': true, '480p': true, '720p': false, '1080p': false, + '1440p': false, '2160p': false }, webtorrent: { @@ -288,6 +341,27 @@ describe('Test config', function () { enabled: false } }, + live: { + enabled: true, + allowReplay: true, + maxDuration: 5000, + maxInstanceLives: -1, + maxUserLives: 10, + transcoding: { + enabled: true, + threads: 4, + profile: 'live_profile', + resolutions: { + '240p': true, + '360p': true, + '480p': true, + '720p': true, + '1080p': true, + '1440p': true, + '2160p': true + } + } + }, import: { videos: { http: { @@ -298,6 +372,14 @@ describe('Test config', function () { } } }, + trending: { + videos: { + algorithms: { + enabled: [ 'hot', 'most-viewed', 'most-liked' ], + default: 'hot' + } + } + }, autoBlacklist: { videos: { ofUsers: { @@ -321,6 +403,24 @@ describe('Test config', function () { indexUrl: 'https://updated.example.com' } } + }, + broadcastMessage: { + enabled: true, + level: 'error', + message: 'super bad message', + dismissable: true + }, + search: { + remoteUri: { + anonymous: true, + users: true + }, + searchIndex: { + enabled: true, + url: 'https://search.joinpeertube.org', + disableLocalSearch: true, + isDefaultSearch: true + } } } await updateCustomConfig(server.url, server.accessToken, newCustomConfig) @@ -332,21 +432,24 @@ describe('Test config', function () { }) it('Should have the correct updated video allowed extensions', async function () { + this.timeout(10000) + const res = await getConfig(server.url) const data: ServerConfig = res.body - expect(data.video.file.extensions).to.have.length.above(3) + expect(data.video.file.extensions).to.have.length.above(4) expect(data.video.file.extensions).to.contain('.mp4') expect(data.video.file.extensions).to.contain('.webm') expect(data.video.file.extensions).to.contain('.ogv') expect(data.video.file.extensions).to.contain('.flv') + expect(data.video.file.extensions).to.contain('.wmv') expect(data.video.file.extensions).to.contain('.mkv') expect(data.video.file.extensions).to.contain('.mp3') expect(data.video.file.extensions).to.contain('.ogg') expect(data.video.file.extensions).to.contain('.flac') - await uploadVideo(server.url, server.accessToken, { fixture: 'video_short.mkv' }, 200) - await uploadVideo(server.url, server.accessToken, { fixture: 'sample.ogg' }, 200) + await uploadVideo(server.url, server.accessToken, { fixture: 'video_short.mkv' }, HttpStatusCode.OK_200) + await uploadVideo(server.url, server.accessToken, { fixture: 'sample.ogg' }, HttpStatusCode.OK_200) }) it('Should have the configuration updated after a restart', async function () {