X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=f33e5c1dadb71bcb50fdaf7ac2f515ea0a9b9b0d;hb=012580d98f489e599d44a9a2a0bdc892b9455a90;hp=d9a472fddbaccca872e98fd4f161f258485e7d3f;hpb=d6d96bed80700830063c6055969d2d2ff46c63c6;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/client.ts b/server/tests/client.ts
index d9a472fdd..f33e5c1da 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -2,8 +2,10 @@
import 'mocha'
import * as chai from 'chai'
+import { omit } from 'lodash'
import * as request from 'supertest'
-import { Account, HTMLServerConfig, ServerConfig, VideoPlaylistPrivacy } from '@shared/models'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
+import { Account, CustomConfig, HTMLServerConfig, ServerConfig, VideoPlaylistPrivacy } from '@shared/models'
import {
addVideoInPlaylist,
cleanupTests,
@@ -14,6 +16,7 @@ import {
getConfig,
getCustomConfig,
getVideosList,
+ makeGetRequest,
makeHTMLRequest,
ServerInfo,
setAccessTokensToServers,
@@ -25,8 +28,6 @@ import {
uploadVideo,
waitJobs
} from '../../shared/extra-utils'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { omit } from 'lodash'
const expect = chai.expect
@@ -144,52 +145,36 @@ describe('Test a client controllers', function () {
describe('Open Graph', function () {
- it('Should have valid Open Graph tags on the account page', async function () {
- const accountPageTests = (res) => {
- expect(res.text).to.contain(``)
- expect(res.text).to.contain(``)
- expect(res.text).to.contain('')
- expect(res.text).to.contain(``)
- }
+ async function accountPageTest (path: string) {
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const text = res.text
- accountPageTests(await request(servers[0].url)
- .get('/accounts/' + servers[0].user.username)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ expect(text).to.contain(``)
+ expect(text).to.contain(``)
+ expect(text).to.contain('')
+ expect(text).to.contain(``)
+ }
- accountPageTests(await request(servers[0].url)
- .get('/a/' + servers[0].user.username)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ async function channelPageTest (path: string) {
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const text = res.text
- accountPageTests(await request(servers[0].url)
- .get('/@' + servers[0].user.username)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ expect(text).to.contain(``)
+ expect(text).to.contain(``)
+ expect(text).to.contain('')
+ expect(text).to.contain(``)
+ }
+
+ it('Should have valid Open Graph tags on the account page', async function () {
+ await accountPageTest('/accounts/' + servers[0].user.username)
+ await accountPageTest('/a/' + servers[0].user.username)
+ await accountPageTest('/@' + servers[0].user.username)
})
it('Should have valid Open Graph tags on the channel page', async function () {
- const channelPageOGtests = (res) => {
- expect(res.text).to.contain(``)
- expect(res.text).to.contain(``)
- expect(res.text).to.contain('')
- expect(res.text).to.contain(``)
- }
-
- channelPageOGtests(await request(servers[0].url)
- .get('/video-channels/' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
-
- channelPageOGtests(await request(servers[0].url)
- .get('/c/' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
-
- channelPageOGtests(await request(servers[0].url)
- .get('/@' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ await channelPageTest('/video-channels/' + servers[0].videoChannel.name)
+ await channelPageTest('/c/' + servers[0].videoChannel.name)
+ await channelPageTest('/@' + servers[0].videoChannel.name)
})
it('Should have valid Open Graph tags on the watch page with video id', async function () {
@@ -231,142 +216,125 @@ describe('Test a client controllers', function () {
describe('Twitter card', async function () {
- it('Should have valid twitter card on the watch video page', async function () {
- const res = await request(servers[0].url)
- .get('/videos/watch/' + servers[0].video.uuid)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200)
+ describe('Not whitelisted', function () {
- expect(res.text).to.contain('')
- expect(res.text).to.contain('')
- expect(res.text).to.contain(``)
- expect(res.text).to.contain(``)
- })
+ async function accountPageTest (path: string) {
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const text = res.text
- it('Should have valid twitter card on the watch playlist page', async function () {
- const res = await request(servers[0].url)
- .get('/videos/watch/playlist/' + playlistUUID)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200)
+ expect(text).to.contain('')
+ expect(text).to.contain('')
+ expect(text).to.contain(``)
+ expect(text).to.contain(``)
+ }
- expect(res.text).to.contain('')
- expect(res.text).to.contain('')
- expect(res.text).to.contain(``)
- expect(res.text).to.contain(``)
- })
+ async function channelPageTest (path: string) {
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const text = res.text
- it('Should have valid twitter card on the account page', async function () {
- const accountPageTests = (res) => {
- expect(res.text).to.contain('')
- expect(res.text).to.contain('')
- expect(res.text).to.contain(``)
- expect(res.text).to.contain(``)
+ expect(text).to.contain('')
+ expect(text).to.contain('')
+ expect(text).to.contain(``)
+ expect(text).to.contain(``)
}
- accountPageTests(await request(servers[0].url)
- .get('/accounts/' + account.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ it('Should have valid twitter card on the watch video page', async function () {
+ const res = await request(servers[0].url)
+ .get('/videos/watch/' + servers[0].video.uuid)
+ .set('Accept', 'text/html')
+ .expect(HttpStatusCode.OK_200)
- accountPageTests(await request(servers[0].url)
- .get('/a/' + account.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ expect(res.text).to.contain('')
+ expect(res.text).to.contain('')
+ expect(res.text).to.contain(``)
+ expect(res.text).to.contain(``)
+ })
- accountPageTests(await request(servers[0].url)
- .get('/@' + account.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
- })
+ it('Should have valid twitter card on the watch playlist page', async function () {
+ const res = await request(servers[0].url)
+ .get('/videos/watch/playlist/' + playlistUUID)
+ .set('Accept', 'text/html')
+ .expect(HttpStatusCode.OK_200)
- it('Should have valid twitter card on the channel page', async function () {
- const channelPageTests = (res) => {
expect(res.text).to.contain('')
expect(res.text).to.contain('')
- expect(res.text).to.contain(``)
- expect(res.text).to.contain(``)
- }
-
- channelPageTests(await request(servers[0].url)
- .get('/video-channels/' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ expect(res.text).to.contain(``)
+ expect(res.text).to.contain(``)
+ })
- channelPageTests(await request(servers[0].url)
- .get('/c/' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ it('Should have valid twitter card on the account page', async function () {
+ await accountPageTest('/accounts/' + account.name)
+ await accountPageTest('/a/' + account.name)
+ await accountPageTest('/@' + account.name)
+ })
- channelPageTests(await request(servers[0].url)
- .get('/@' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ it('Should have valid twitter card on the channel page', async function () {
+ await channelPageTest('/video-channels/' + servers[0].videoChannel.name)
+ await channelPageTest('/c/' + servers[0].videoChannel.name)
+ await channelPageTest('/@' + servers[0].videoChannel.name)
+ })
})
- it('Should have valid twitter card if Twitter is whitelisted', async function () {
- const res1 = await getCustomConfig(servers[0].url, servers[0].accessToken)
- const config = res1.body
- config.services.twitter = {
- username: '@Kuja',
- whitelisted: true
- }
- await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
-
- const resVideoRequest = await request(servers[0].url)
- .get('/videos/watch/' + servers[0].video.uuid)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200)
+ describe('Whitelisted', function () {
- expect(resVideoRequest.text).to.contain('')
- expect(resVideoRequest.text).to.contain('')
+ before(async function () {
+ const res = await getCustomConfig(servers[0].url, servers[0].accessToken)
+ const config = res.body as CustomConfig
+ config.services.twitter = {
+ username: '@Kuja',
+ whitelisted: true
+ }
- const resVideoPlaylistRequest = await request(servers[0].url)
- .get('/videos/watch/playlist/' + playlistUUID)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200)
+ await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
+ })
- expect(resVideoPlaylistRequest.text).to.contain('')
- expect(resVideoPlaylistRequest.text).to.contain('')
+ async function accountPageTest (path: string) {
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const text = res.text
- const accountTests = (res) => {
- expect(res.text).to.contain('')
- expect(res.text).to.contain('')
+ expect(text).to.contain('')
+ expect(text).to.contain('')
}
- accountTests(await request(servers[0].url)
- .get('/accounts/' + account.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ async function channelPageTest (path: string) {
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const text = res.text
- accountTests(await request(servers[0].url)
- .get('/a/' + account.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ expect(text).to.contain('')
+ expect(text).to.contain('')
+ }
- accountTests(await request(servers[0].url)
- .get('/@' + account.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ it('Should have valid twitter card on the watch video page', async function () {
+ const res = await request(servers[0].url)
+ .get('/videos/watch/' + servers[0].video.uuid)
+ .set('Accept', 'text/html')
+ .expect(HttpStatusCode.OK_200)
- const channelTests = (res) => {
- expect(res.text).to.contain('')
+ expect(res.text).to.contain('')
expect(res.text).to.contain('')
- }
+ })
- channelTests(await request(servers[0].url)
- .get('/video-channels/' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ it('Should have valid twitter card on the watch playlist page', async function () {
+ const res = await request(servers[0].url)
+ .get('/videos/watch/playlist/' + playlistUUID)
+ .set('Accept', 'text/html')
+ .expect(HttpStatusCode.OK_200)
- channelTests(await request(servers[0].url)
- .get('/c/' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ expect(res.text).to.contain('')
+ expect(res.text).to.contain('')
+ })
- channelTests(await request(servers[0].url)
- .get('/@' + servers[0].videoChannel.name)
- .set('Accept', 'text/html')
- .expect(HttpStatusCode.OK_200))
+ it('Should have valid twitter card on the account page', async function () {
+ await accountPageTest('/accounts/' + account.name)
+ await accountPageTest('/a/' + account.name)
+ await accountPageTest('/@' + account.name)
+ })
+
+ it('Should have valid twitter card on the channel page', async function () {
+ await channelPageTest('/video-channels/' + servers[0].videoChannel.name)
+ await channelPageTest('/c/' + servers[0].videoChannel.name)
+ await channelPageTest('/@' + servers[0].videoChannel.name)
+ })
})
})