X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=253a9562432a75e047839f0997caf03cf23dd3ba;hb=1f256e7d3cf056c2d999260155cdba58ae1b878b;hp=d9a472fddbaccca872e98fd4f161f258485e7d3f;hpb=8f608a4cb22ab232cfab20665050764b38bac9c7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/client.ts b/server/tests/client.ts index d9a472fdd..253a95624 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 @@ -53,6 +54,9 @@ describe('Test a client controllers', function () { const channelDescription = 'my super channel description' + const watchVideoBasePaths = [ '/videos/watch/', '/w/' ] + const watchPlaylistBasePaths = [ '/videos/watch/playlist/', '/w/p/' ] + before(async function () { this.timeout(120000) @@ -110,263 +114,247 @@ describe('Test a client controllers', function () { }) describe('oEmbed', function () { + it('Should have valid oEmbed discovery tags for videos', async function () { - const path = '/videos/watch/' + servers[0].video.uuid - const res = await request(servers[0].url) - .get(path) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200) + for (const basePath of watchVideoBasePaths) { + const path = basePath + servers[0].video.uuid + const res = await request(servers[0].url) + .get(path) + .set('Accept', 'text/html') + .expect(HttpStatusCode.OK_200) - const port = servers[0].port + const port = servers[0].port - const expectedLink = '` + const expectedLink = '` - expect(res.text).to.contain(expectedLink) + expect(res.text).to.contain(expectedLink) + } }) it('Should have valid oEmbed discovery tags for a playlist', async function () { - const res = await request(servers[0].url) - .get('/videos/watch/playlist/' + playlistUUID) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200) + for (const basePath of watchPlaylistBasePaths) { + const res = await request(servers[0].url) + .get(basePath + playlistUUID) + .set('Accept', 'text/html') + .expect(HttpStatusCode.OK_200) - const port = servers[0].port + const port = servers[0].port - const expectedLink = '` + const expectedLink = '` - expect(res.text).to.contain(expectedLink) + expect(res.text).to.contain(expectedLink) + } }) }) 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)) - }) - - 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(``) - } + expect(text).to.contain(``) + expect(text).to.contain(``) + expect(text).to.contain('') + expect(text).to.contain(``) + } - channelPageOGtests(await request(servers[0].url) - .get('/video-channels/' + servers[0].videoChannel.name) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200)) + async function watchVideoPageTest (path: string) { + const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 }) + const text = res.text - channelPageOGtests(await request(servers[0].url) - .get('/c/' + servers[0].videoChannel.name) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200)) + expect(text).to.contain(``) + expect(text).to.contain(``) + expect(text).to.contain('') + expect(text).to.contain(``) + } - channelPageOGtests(await request(servers[0].url) - .get('/@' + servers[0].videoChannel.name) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200)) - }) + async function watchPlaylistPageTest (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 Open Graph tags on the watch page with video id', async function () { - const res = await request(servers[0].url) - .get('/videos/watch/' + servers[0].video.id) - .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(``) + 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 watch page with video uuid', async function () { - const res = await request(servers[0].url) - .get('/videos/watch/' + servers[0].video.uuid) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200) + it('Should have valid Open Graph tags 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) + }) - expect(res.text).to.contain(``) - expect(res.text).to.contain(``) - expect(res.text).to.contain('') - expect(res.text).to.contain(``) + it('Should have valid Open Graph tags on the watch page', async function () { + await watchVideoPageTest('/videos/watch/' + servers[0].video.id) + await watchVideoPageTest('/videos/watch/' + servers[0].video.uuid) + await watchVideoPageTest('/w/' + servers[0].video.uuid) + await watchVideoPageTest('/w/' + servers[0].video.id) }) it('Should have valid Open Graph tags 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(res.text).to.contain(``) - expect(res.text).to.contain(``) - expect(res.text).to.contain('') - expect(res.text).to.contain(``) + await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID) + await watchPlaylistPageTest('/w/p/' + playlistUUID) }) }) 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)) + async function watchVideoPageTest (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('/a/' + account.name) - .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('/@' + account.name) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200)) - }) + async function watchPlaylistPageTest (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 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(``) + expect(text).to.contain('') + expect(text).to.contain('') + expect(text).to.contain(``) + expect(text).to.contain(``) } - channelPageTests(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 video page', async function () { + await watchVideoPageTest('/videos/watch/' + servers[0].video.id) + await watchVideoPageTest('/videos/watch/' + servers[0].video.uuid) + await watchVideoPageTest('/w/' + servers[0].video.uuid) + await watchVideoPageTest('/w/' + servers[0].video.id) + }) - 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 watch playlist page', async function () { + await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID) + await watchPlaylistPageTest('/w/p/' + playlistUUID) + }) - 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 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) + }) }) - 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) + describe('Whitelisted', function () { + + 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 resVideoRequest = await request(servers[0].url) - .get('/videos/watch/' + servers[0].video.uuid) - .set('Accept', 'text/html') - .expect(HttpStatusCode.OK_200) + await updateCustomConfig(servers[0].url, servers[0].accessToken, config) + }) - expect(resVideoRequest.text).to.contain('') - expect(resVideoRequest.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 resVideoPlaylistRequest = 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(resVideoPlaylistRequest.text).to.contain('') - expect(resVideoPlaylistRequest.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 - 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 watchVideoPageTest (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)) + async function watchPlaylistPageTest (path: string) { + const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 }) + const text = res.text - const channelTests = (res) => { - expect(res.text).to.contain('') - expect(res.text).to.contain('') + expect(text).to.contain('') + expect(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 video page', async function () { + await watchVideoPageTest('/videos/watch/' + servers[0].video.id) + await watchVideoPageTest('/videos/watch/' + servers[0].video.uuid) + await watchVideoPageTest('/w/' + servers[0].video.uuid) + await watchVideoPageTest('/w/' + servers[0].video.id) + }) - channelTests(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 watch playlist page', async function () { + await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID) + await watchPlaylistPageTest('/w/p/' + playlistUUID) + }) - 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) + }) }) }) @@ -410,8 +398,10 @@ describe('Test a client controllers', function () { }) it('Should use the original video URL for the canonical tag', async function () { - const res = await makeHTMLRequest(servers[1].url, '/videos/watch/' + servers[0].video.uuid) - expect(res.text).to.contain(``) + for (const basePath of watchVideoBasePaths) { + const res = await makeHTMLRequest(servers[1].url, basePath + servers[0].video.uuid) + expect(res.text).to.contain(``) + } }) it('Should use the original account URL for the canonical tag', async function () { @@ -435,8 +425,10 @@ describe('Test a client controllers', function () { }) it('Should use the original playlist URL for the canonical tag', async function () { - const res = await makeHTMLRequest(servers[1].url, '/videos/watch/playlist/' + playlistUUID) - expect(res.text).to.contain(``) + for (const basePath of watchPlaylistBasePaths) { + const res = await makeHTMLRequest(servers[1].url, basePath + playlistUUID) + expect(res.text).to.contain(``) + } }) })