X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=e84251561446203cae3102ff1260e9458ffb224f;hb=57c318653e6a8ae9d0c2541a62853fb8dd582d5d;hp=fe048d7ff4a05bbdf89ca5345a793aafc094339e;hpb=bf54587a3e2ad9c2c186828f2a5682b91ee2cc00;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/client.ts b/server/tests/client.ts
index fe048d7ff..e84251561 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -1,9 +1,16 @@
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import 'mocha'
-import * as chai from 'chai'
-import { omit } from 'lodash'
-import { Account, HTMLServerConfig, HttpStatusCode, ServerConfig, VideoPlaylistCreateResult, VideoPlaylistPrivacy } from '@shared/models'
+import { expect } from 'chai'
+import { omit } from '@shared/core-utils'
+import {
+ Account,
+ HTMLServerConfig,
+ HttpStatusCode,
+ ServerConfig,
+ VideoPlaylistCreateResult,
+ VideoPlaylistPrivacy,
+ VideoPrivacy
+} from '@shared/models'
import {
cleanupTests,
createMultipleServers,
@@ -16,14 +23,12 @@ import {
waitJobs
} from '../../shared/server-commands'
-const expect = chai.expect
-
function checkIndexTags (html: string, title: string, description: string, css: string, config: ServerConfig) {
expect(html).to.contain('
' + title + '')
expect(html).to.contain('')
expect(html).to.contain('')
- const htmlConfig: HTMLServerConfig = omit(config, 'signup')
+ const htmlConfig: HTMLServerConfig = omit(config, [ 'signup' ])
const configObjectString = JSON.stringify(htmlConfig)
const configEscapedString = JSON.stringify(configObjectString)
@@ -48,6 +53,10 @@ describe('Test a client controllers', function () {
const watchPlaylistBasePaths = [ '/videos/watch/playlist/', '/w/p/' ]
let videoIds: (string | number)[] = []
+ let privateVideoId: string
+ let internalVideoId: string
+ let unlistedVideoId: string
+
let playlistIds: (string | number)[] = []
before(async function () {
@@ -66,7 +75,7 @@ describe('Test a client controllers', function () {
attributes: { description: channelDescription }
})
- // Video
+ // Public video
{
const attributes = { name: videoName, description: videoDescription }
@@ -80,6 +89,12 @@ describe('Test a client controllers', function () {
videoIds = [ video.id, video.uuid, video.shortUUID ]
}
+ {
+ ({ uuid: privateVideoId } = await servers[0].videos.quickUpload({ name: 'private', privacy: VideoPrivacy.PRIVATE }));
+ ({ uuid: unlistedVideoId } = await servers[0].videos.quickUpload({ name: 'unlisted', privacy: VideoPrivacy.UNLISTED }));
+ ({ uuid: internalVideoId } = await servers[0].videos.quickUpload({ name: 'internal', privacy: VideoPrivacy.INTERNAL }))
+ }
+
// Playlist
{
@@ -119,11 +134,9 @@ describe('Test a client controllers', function () {
expectedStatus: HttpStatusCode.OK_200
})
- const port = servers[0].port
-
- const expectedLink = '`
+ const expectedLink = ``
expect(res.text).to.contain(expectedLink)
}
@@ -140,10 +153,8 @@ describe('Test a client controllers', function () {
expectedStatus: HttpStatusCode.OK_200
})
- const port = servers[0].port
-
- const expectedLink = '`
expect(res.text).to.contain(expectedLink)
@@ -161,7 +172,7 @@ describe('Test a client controllers', function () {
expect(text).to.contain(``)
expect(text).to.contain(``)
expect(text).to.contain('')
- expect(text).to.contain(``)
+ expect(text).to.contain(``)
}
async function channelPageTest (path: string) {
@@ -171,7 +182,7 @@ describe('Test a client controllers', function () {
expect(text).to.contain(``)
expect(text).to.contain(``)
expect(text).to.contain('')
- expect(text).to.contain(``)
+ expect(text).to.contain(``)
}
async function watchVideoPageTest (path: string) {
@@ -214,6 +225,14 @@ describe('Test a client controllers', function () {
}
})
+ it('Should have valid Open Graph tags on the watch page with thread id Angular param', async function () {
+ for (const path of watchVideoBasePaths) {
+ for (const id of videoIds) {
+ await watchVideoPageTest(path + id + ';threadId=1')
+ }
+ }
+ })
+
it('Should have valid Open Graph tags on the watch playlist page', async function () {
for (const path of watchPlaylistBasePaths) {
for (const id of playlistIds) {
@@ -466,7 +485,7 @@ describe('Test a client controllers', function () {
}
})
- it('Should add noindex meta tag for remote accounts', async function () {
+ it('Should add noindex meta tag for remote channels', async function () {
const handle = 'root_channel@' + servers[0].host
const paths = [ '/video-channels/', '/c/', '/@' ]
@@ -482,6 +501,36 @@ describe('Test a client controllers', function () {
}
}
})
+
+ it('Should not display internal/private video', async function () {
+ for (const basePath of watchVideoBasePaths) {
+ for (const id of [ privateVideoId, internalVideoId ]) {
+ const res = await makeGetRequest({
+ url: servers[0].url,
+ path: basePath + id,
+ accept: 'text/html',
+ expectedStatus: HttpStatusCode.NOT_FOUND_404
+ })
+
+ expect(res.text).to.not.contain('internal')
+ expect(res.text).to.not.contain('private')
+ }
+ }
+ })
+
+ it('Should add noindex meta tag for unlisted video', async function () {
+ for (const basePath of watchVideoBasePaths) {
+ const res = await makeGetRequest({
+ url: servers[0].url,
+ path: basePath + unlistedVideoId,
+ accept: 'text/html',
+ expectedStatus: HttpStatusCode.OK_200
+ })
+
+ expect(res.text).to.contain('unlisted')
+ expect(res.text).to.contain('')
+ }
+ })
})
describe('Embed HTML', function () {