From ae174d825b344ab6e049299de15200b0948573f5 Mon Sep 17 00:00:00 2001 From: kimsible Date: Fri, 24 Jul 2020 21:09:18 +0200 Subject: [PATCH] Add client.ts tests for account, channel and playlist tags --- server/lib/client-html.ts | 16 ++-- server/tests/client.ts | 181 ++++++++++++++++++++++++++++++++++---- 2 files changed, 174 insertions(+), 23 deletions(-) diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index d6a15efcad8..ffe53d0d50d 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts @@ -119,7 +119,7 @@ export class ClientHtml { } const list = { - 'numberOfItems': videoPlaylist.get('videosLength') + numberOfItems: videoPlaylist.get('videosLength') } const ogType = 'video' @@ -284,10 +284,10 @@ export class ClientHtml { metaTags['og:description'] = tags.description if (tags.embed) { - metaTags['og:video:url'] = tags.embed.url, - metaTags['og:video:secure_url'] = tags.embed.url, - metaTags['og:video:type'] = 'text/html', - metaTags['og:video:width'] = EMBED_SIZE.width, + metaTags['og:video:url'] = tags.embed.url + metaTags['og:video:secure_url'] = tags.embed.url + metaTags['og:video:type'] = 'text/html' + metaTags['og:video:width'] = EMBED_SIZE.width metaTags['og:video:height'] = EMBED_SIZE.height } @@ -296,9 +296,9 @@ export class ClientHtml { private static generateStandardMetaTags (tags) { return { - 'name': tags.title, - 'description': tags.description, - 'image': tags.image.url + name: tags.title, + description: tags.description, + image: tags.image.url } } diff --git a/server/tests/client.ts b/server/tests/client.ts index 670bc670169..1f26053e572 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts @@ -13,8 +13,15 @@ import { serverLogin, updateCustomConfig, updateCustomSubConfig, - uploadVideo + uploadVideo, + createVideoPlaylist, + addVideoInPlaylist, + getAccount, + addVideoChannel } from '../../shared/extra-utils' +import { VideoPlaylistPrivacy } from '@shared/models' +import { MVideoPlaylist, MAccount, MChannel } from '@server/types/models' + const expect = chai.expect @@ -26,6 +33,11 @@ function checkIndexTags (html: string, title: string, description: string, css: describe('Test a client controllers', function () { let server: ServerInfo + let videoPlaylist: MVideoPlaylist + let account: MAccount + let videoChannel: MChannel + const name = 'my super name for server 1' + const description = 'my super description for server 1' before(async function () { this.timeout(120000) @@ -33,18 +45,55 @@ describe('Test a client controllers', function () { server = await flushAndRunServer(1) server.accessToken = await serverLogin(server) - const videoAttributes = { - name: 'my super name for server 1', - description: 'my super description for server 1' - } + + // Video + + const videoAttributes = { name, description } + await uploadVideo(server.url, server.accessToken, videoAttributes) - const res = await getVideosList(server.url) - const videos = res.body.data + const resVideosRequest = await getVideosList(server.url) + + const videos = resVideosRequest.body.data.videos expect(videos.length).to.equal(1) server.video = videos[0] + + + // Playlist + + const playlistAttrs = { + displayName: name, + description, + privacy: VideoPlaylistPrivacy.PUBLIC + } + + const resVideoPlaylistRequest = await createVideoPlaylist({ url: server.url, token: server.accessToken, playlistAttrs }) + + videoPlaylist = resVideoPlaylistRequest.body.videoPlaylist + + await addVideoInPlaylist({ url: server.url, token: server.accessToken, playlistId: videoPlaylist.id, elementAttrs: { videoId: server.video.id } }) + + + // Account + + const resAccountRequest = await getAccount(server.url, `${server.user.username}@${server.host}:${server.port}`) + + account = resAccountRequest.body.account + + + // Channel + + const videoChannelAttributesArg = { + name: `${server.user.username}_channel`, + displayName: name, + description + } + + const resChannelRequest = await addVideoChannel(server.url, server.accessToken, videoChannelAttributesArg) + + videoChannel = resChannelRequest.body.videoChannel }) it('Should have valid Open Graph tags on the watch page with video id', async function () { @@ -53,8 +102,10 @@ describe('Test a client controllers', function () { .set('Accept', 'text/html') .expect(200) - expect(res.text).to.contain('') - expect(res.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 watch page with video uuid', async function () { @@ -63,8 +114,46 @@ describe('Test a client controllers', function () { .set('Accept', 'text/html') .expect(200) - expect(res.text).to.contain('') - expect(res.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 watch playlist page', async function () { + const res = await request(server.url) + .get('/videos/watch/playlist/' + videoPlaylist.uuid) + .set('Accept', 'text/html') + .expect(200) + + 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 () { + const res = await request(server.url) + .get('/accounts/' + server.user.username) + .set('Accept', 'text/html') + .expect(200) + + 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 channel page', async function () { + const res = await request(server.url) + .get('/video-channels/' + videoChannel.name) + .set('Accept', 'text/html') + .expect(200) + + expect(res.text).to.contain(``) + expect(res.text).to.contain(``) + expect(res.text).to.contain('') + expect(res.text).to.contain(``) }) it('Should have valid oEmbed discovery tags', async function () { @@ -81,7 +170,7 @@ describe('Test a client controllers', function () { expect(res.text).to.contain(expectedLink) }) - it('Should have valid twitter card', async function () { + it('Should have valid twitter card on the whatch video page', async function () { const res = await request(server.url) .get('/videos/watch/' + server.video.uuid) .set('Accept', 'text/html') @@ -89,6 +178,44 @@ describe('Test a client controllers', function () { expect(res.text).to.contain('') expect(res.text).to.contain('') + expect(res.text).to.contain(``) + expect(res.text).to.contain(``) + }) + + it('Should have valid twitter card on the watch playlist page', async function () { + const res = await request(server.url) + .get('/videos/watch/playlist/' + videoPlaylist.uuid) + .set('Accept', 'text/html') + .expect(200) + + expect(res.text).to.contain('') + expect(res.text).to.contain('') + expect(res.text).to.contain(``) + expect(res.text).to.contain(``) + }) + + it('Should have valid twitter card on the account page', async function () { + const res = await request(server.url) + .get('/accounts/' + account.name) + .set('Accept', 'text/html') + .expect(200) + + expect(res.text).to.contain('') + expect(res.text).to.contain('') + expect(res.text).to.contain(``) + expect(res.text).to.contain(``) + }) + + it('Should have valid twitter card on the channel page', async function () { + const res = await request(server.url) + .get('/video-channels/' + videoChannel.name) + .set('Accept', 'text/html') + .expect(200) + + expect(res.text).to.contain('') + expect(res.text).to.contain('') + expect(res.text).to.contain(``) + expect(res.text).to.contain(``) }) it('Should have valid twitter card if Twitter is whitelisted', async function () { @@ -100,13 +227,37 @@ describe('Test a client controllers', function () { } await updateCustomConfig(server.url, server.accessToken, config) - const res = await request(server.url) + const resVideoRequest = await request(server.url) .get('/videos/watch/' + server.video.uuid) .set('Accept', 'text/html') .expect(200) - expect(res.text).to.contain('') - expect(res.text).to.contain('') + expect(resVideoRequest.text).to.contain('') + expect(resVideoRequest.text).to.contain('') + + const resVideoPlaylistRequest = await request(server.url) + .get('/videos/watch/playlist/' + videoPlaylist.uuid) + .set('Accept', 'text/html') + .expect(200) + + expect(resVideoPlaylistRequest.text).to.contain('') + expect(resVideoPlaylistRequest.text).to.contain('') + + const resAccountRequest = await request(server.url) + .get('/accounts/' + account.name) + .set('Accept', 'text/html') + .expect(200) + + expect(resAccountRequest.text).to.contain('') + expect(resAccountRequest.text).to.contain('') + + const resChannelRequest = await request(server.url) + .get('/video-channels/' + videoChannel.name) + .set('Accept', 'text/html') + .expect(200) + + expect(resChannelRequest.text).to.contain('') + expect(resChannelRequest.text).to.contain('') }) it('Should have valid index html tags (title, description...)', async function () {