X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fconfig.ts;h=eb51d8909c1f1284327f67173ebd26d0242fdf94;hb=8e2392e512f2652267b5483a17ce12f6deb645b8;hp=97cc99eeaf892494bc22a8d8ab22ef7b4d9a16aa;hpb=8d5e65349deebd499c0be10fe02d535a77d58ddb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index 97cc99eea..eb51d8909 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,11 +11,14 @@ 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' @@ -24,8 +27,7 @@ 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,6 +64,7 @@ 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 @@ -72,8 +75,23 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) { expect(data.transcoding.resolutions['720p']).to.be.true expect(data.transcoding.resolutions['1080p']).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.be.null + 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.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['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 @@ -83,7 +101,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) { @@ -140,6 +163,21 @@ function checkUpdatedConfig (data: CustomConfig) { expect(data.transcoding.resolutions['1080p']).to.be.false expect(data.transcoding.resolutions['2160p']).to.be.false 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.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 @@ -151,6 +189,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 () { @@ -272,6 +315,7 @@ describe('Test config', function () { allowAudioFiles: true, threads: 1, resolutions: { + '0p': false, '240p': false, '360p': true, '480p': true, @@ -279,10 +323,32 @@ describe('Test config', function () { '1080p': false, '2160p': false }, + webtorrent: { + enabled: true + }, hls: { enabled: false } }, + live: { + enabled: true, + allowReplay: true, + maxDuration: 5000, + maxInstanceLives: -1, + maxUserLives: 10, + transcoding: { + enabled: true, + threads: 4, + resolutions: { + '240p': true, + '360p': true, + '480p': true, + '720p': true, + '1080p': true, + '2160p': true + } + } + }, import: { videos: { http: { @@ -316,6 +382,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) @@ -327,14 +411,17 @@ 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')