X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Ftests%2Fapi%2Fserver%2Fconfig.ts;h=a505b8eded6dff00a963d153f5962b4f47c81690;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=7d21b6ce9cfdb2a116fdbb58766cd1d88c81c946;hpb=e032aec9b92be25a996923361f83a96a89505254;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 7d21b6ce9..a505b8ede 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -1,78 +1,200 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
import * as chai from 'chai'
import { About } from '../../../../shared/models/server/about.model'
import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
-import { deleteCustomConfig, getAbout, killallServers, makeHTMLRequest, reRunServer } from '../../utils'
-const expect = chai.expect
-
import {
+ cleanupTests,
+ deleteCustomConfig,
+ flushAndRunServer,
+ getAbout,
getConfig,
- flushTests,
- runServer,
- registerUser, getCustomConfig, setAccessTokensToServers, updateCustomConfig
-} from '../../utils/index'
+ getCustomConfig,
+ killallServers,
+ parallelTests,
+ registerUser,
+ reRunServer,
+ ServerInfo,
+ setAccessTokensToServers,
+ updateCustomConfig,
+ uploadVideo
+} from '../../../../shared/extra-utils'
+import { ServerConfig } from '../../../../shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
-function checkInitialConfig (data: CustomConfig) {
+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!')
+
expect(data.instance.terms).to.equal('No terms for now.')
+ expect(data.instance.creationReason).to.be.empty
+ expect(data.instance.codeOfConduct).to.be.empty
+ expect(data.instance.moderationInformation).to.be.empty
+ expect(data.instance.administrator).to.be.empty
+ expect(data.instance.maintenanceLifetime).to.be.empty
+ expect(data.instance.businessModel).to.be.empty
+ expect(data.instance.hardwareInformation).to.be.empty
+
+ expect(data.instance.languages).to.have.lengthOf(0)
+ expect(data.instance.categories).to.have.lengthOf(0)
+
expect(data.instance.defaultClientRoute).to.equal('/videos/trending')
+ expect(data.instance.isNSFW).to.be.false
expect(data.instance.defaultNSFWPolicy).to.equal('display')
expect(data.instance.customizations.css).to.be.empty
expect(data.instance.customizations.javascript).to.be.empty
+
expect(data.services.twitter.username).to.equal('@Chocobozzz')
expect(data.services.twitter.whitelisted).to.be.false
+
expect(data.cache.previews.size).to.equal(1)
expect(data.cache.captions.size).to.equal(1)
+
expect(data.signup.enabled).to.be.true
expect(data.signup.limit).to.equal(4)
- expect(data.admin.email).to.equal('admin1@example.com')
+ expect(data.signup.requiresEmailVerification).to.be.false
+
+ expect(data.admin.email).to.equal('admin' + server.internalServerNumber + '@example.com')
+ expect(data.contactForm.enabled).to.be.true
+
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.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['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
+
+ expect(data.followers.instance.enabled).to.be.true
+ expect(data.followers.instance.manualApproval).to.be.false
+
+ 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('')
+
+ 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) {
expect(data.instance.name).to.equal('PeerTube updated')
expect(data.instance.shortDescription).to.equal('my short description')
expect(data.instance.description).to.equal('my super description')
+
expect(data.instance.terms).to.equal('my super terms')
+ expect(data.instance.creationReason).to.equal('my super creation reason')
+ expect(data.instance.codeOfConduct).to.equal('my super coc')
+ expect(data.instance.moderationInformation).to.equal('my super moderation information')
+ expect(data.instance.administrator).to.equal('Kuja')
+ expect(data.instance.maintenanceLifetime).to.equal('forever')
+ expect(data.instance.businessModel).to.equal('my super business model')
+ expect(data.instance.hardwareInformation).to.equal('2vCore 3GB RAM')
+
+ expect(data.instance.languages).to.deep.equal([ 'en', 'es' ])
+ expect(data.instance.categories).to.deep.equal([ 1, 2 ])
+
expect(data.instance.defaultClientRoute).to.equal('/videos/recently-added')
+ expect(data.instance.isNSFW).to.be.true
expect(data.instance.defaultNSFWPolicy).to.equal('blur')
expect(data.instance.customizations.javascript).to.equal('alert("coucou")')
expect(data.instance.customizations.css).to.equal('body { background-color: red; }')
+
expect(data.services.twitter.username).to.equal('@Kuja')
expect(data.services.twitter.whitelisted).to.be.true
+
expect(data.cache.previews.size).to.equal(2)
expect(data.cache.captions.size).to.equal(3)
+
expect(data.signup.enabled).to.be.false
expect(data.signup.limit).to.equal(5)
- expect(data.admin.email).to.equal('superadmin1@example.com')
+ expect(data.signup.requiresEmailVerification).to.be.false
+
+ // We override admin email in parallel tests, so skip this exception
+ if (parallelTests() === false) {
+ expect(data.admin.email).to.equal('superadmin1@example.com')
+ }
+
+ expect(data.contactForm.enabled).to.be.false
+
expect(data.user.videoQuota).to.equal(5242881)
+ expect(data.user.videoQuotaDaily).to.equal(318742)
+
expect(data.transcoding.enabled).to.be.true
expect(data.transcoding.threads).to.equal(1)
+ expect(data.transcoding.allowAdditionalExtensions).to.be.true
+ expect(data.transcoding.allowAudioFiles).to.be.true
expect(data.transcoding.resolutions['240p']).to.be.false
expect(data.transcoding.resolutions['360p']).to.be.true
expect(data.transcoding.resolutions['480p']).to.be.true
expect(data.transcoding.resolutions['720p']).to.be.false
expect(data.transcoding.resolutions['1080p']).to.be.false
-}
-
-function checkIndexTags (html: string, title: string, description: string, css: string) {
- expect(html).to.contain('
' + title + '')
- expect(html).to.contain('')
- expect(html).to.contain('')
+ 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
+ expect(data.autoBlacklist.videos.ofUsers.enabled).to.be.true
+
+ expect(data.followers.instance.enabled).to.be.false
+ expect(data.followers.instance.manualApproval).to.be.true
+
+ 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 () {
@@ -81,14 +203,13 @@ describe('Test config', function () {
before(async function () {
this.timeout(30000)
- await flushTests()
- server = await runServer(1)
+ server = await flushAndRunServer(1)
await setAccessTokensToServers([ server ])
})
it('Should have a correct config on a server with registration enabled', async function () {
const res = await getConfig(server.url)
- const data = res.body
+ const data: ServerConfig = res.body
expect(data.signup.allowed).to.be.true
})
@@ -103,24 +224,31 @@ describe('Test config', function () {
])
const res = await getConfig(server.url)
- const data = res.body
+ const data: ServerConfig = res.body
expect(data.signup.allowed).to.be.false
})
- it('Should get the customized configuration', async function () {
- const res = await getCustomConfig(server.url, server.accessToken)
- const data = res.body as CustomConfig
+ it('Should have the correct video allowed extensions', async function () {
+ const res = await getConfig(server.url)
+ const data: ServerConfig = res.body
+
+ expect(data.video.file.extensions).to.have.lengthOf(3)
+ expect(data.video.file.extensions).to.contain('.mp4')
+ 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' }, HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415)
+ await uploadVideo(server.url, server.accessToken, { fixture: 'sample.ogg' }, HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415)
- checkInitialConfig(data)
+ expect(data.contactForm.enabled).to.be.true
})
- it('Should have valid index html tags (title, description...)', async function () {
- const res = await makeHTMLRequest(server.url, '/videos/trending')
+ it('Should get the customized configuration', async function () {
+ const res = await getCustomConfig(server.url, server.accessToken)
+ const data = res.body as CustomConfig
- const description = 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' +
- 'with WebTorrent and Angular.'
- checkIndexTags(res.text, 'PeerTube', description, '')
+ checkInitialConfig(server, data)
})
it('Should update the customized configuration', async function () {
@@ -130,13 +258,29 @@ describe('Test config', function () {
shortDescription: 'my short description',
description: 'my super description',
terms: 'my super terms',
+ codeOfConduct: 'my super coc',
+
+ creationReason: 'my super creation reason',
+ moderationInformation: 'my super moderation information',
+ administrator: 'Kuja',
+ maintenanceLifetime: 'forever',
+ businessModel: 'my super business model',
+ hardwareInformation: '2vCore 3GB RAM',
+
+ languages: [ 'en', 'es' ],
+ categories: [ 1, 2 ],
+
defaultClientRoute: '/videos/recently-added',
+ isNSFW: true,
defaultNSFWPolicy: 'blur' as 'blur',
customizations: {
javascript: 'alert("coucou")',
css: 'body { background-color: red; }'
}
},
+ theme: {
+ default: 'default'
+ },
services: {
twitter: {
username: '@Kuja',
@@ -153,23 +297,109 @@ describe('Test config', function () {
},
signup: {
enabled: false,
- limit: 5
+ limit: 5,
+ requiresEmailVerification: false
},
admin: {
email: 'superadmin1@example.com'
},
+ contactForm: {
+ enabled: false
+ },
user: {
- videoQuota: 5242881
+ videoQuota: 5242881,
+ videoQuotaDaily: 318742
},
transcoding: {
enabled: true,
+ allowAdditionalExtensions: true,
+ allowAudioFiles: true,
threads: 1,
resolutions: {
+ '0p': false,
'240p': false,
'360p': true,
'480p': true,
'720p': false,
- '1080p': false
+ '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: {
+ enabled: false
+ },
+ torrent: {
+ enabled: false
+ }
+ }
+ },
+ autoBlacklist: {
+ videos: {
+ ofUsers: {
+ enabled: true
+ }
+ }
+ },
+ followers: {
+ instance: {
+ enabled: false,
+ manualApproval: true
+ }
+ },
+ followings: {
+ instance: {
+ autoFollowBack: {
+ enabled: true
+ },
+ autoFollowIndex: {
+ enabled: true,
+ 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
}
}
}
@@ -181,10 +411,25 @@ describe('Test config', function () {
checkUpdatedConfig(data)
})
- it('Should have valid index html updated tags (title, description...)', async function () {
- const res = await makeHTMLRequest(server.url, '/videos/trending')
+ it('Should have the correct updated video allowed extensions', async function () {
+ this.timeout(10000)
- checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+ const res = await getConfig(server.url)
+ const data: ServerConfig = res.body
+
+ 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' }, 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 () {
@@ -198,10 +443,6 @@ describe('Test config', function () {
const data = res.body
checkUpdatedConfig(data)
-
- // Check HTML too
- const resHtml = await makeHTMLRequest(server.url, '/videos/trending')
- checkIndexTags(resHtml.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
})
it('Should fetch the about information', async function () {
@@ -212,6 +453,17 @@ describe('Test config', function () {
expect(data.instance.shortDescription).to.equal('my short description')
expect(data.instance.description).to.equal('my super description')
expect(data.instance.terms).to.equal('my super terms')
+ expect(data.instance.codeOfConduct).to.equal('my super coc')
+
+ expect(data.instance.creationReason).to.equal('my super creation reason')
+ expect(data.instance.moderationInformation).to.equal('my super moderation information')
+ expect(data.instance.administrator).to.equal('Kuja')
+ expect(data.instance.maintenanceLifetime).to.equal('forever')
+ expect(data.instance.businessModel).to.equal('my super business model')
+ expect(data.instance.hardwareInformation).to.equal('2vCore 3GB RAM')
+
+ expect(data.instance.languages).to.deep.equal([ 'en', 'es' ])
+ expect(data.instance.categories).to.deep.equal([ 1, 2 ])
})
it('Should remove the custom configuration', async function () {
@@ -222,10 +474,10 @@ describe('Test config', function () {
const res = await getCustomConfig(server.url, server.accessToken)
const data = res.body
- checkInitialConfig(data)
+ checkInitialConfig(server, data)
})
after(async function () {
- killallServers([ server ])
+ await cleanupTests([ server ])
})
})