X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Ftests%2Fclient.ts;h=a8a697f99bebbf91521d65e6731f8701f314ed84;hb=83b1b7eaf1c04837f92de497e74895bee808eb83;hp=959b3465385dac3cdfe7fcef67c068f7c9999715;hpb=254d3579f5338f5fd775c17d15cdfc37078bcfb4;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/client.ts b/server/tests/client.ts
index 959b34653..a8a697f99 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -3,19 +3,26 @@
import 'mocha'
import * as chai from 'chai'
import { omit } from 'lodash'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { Account, HTMLServerConfig, ServerConfig, VideoPlaylistCreateResult, VideoPlaylistPrivacy } from '@shared/models'
+import {
+ Account,
+ HTMLServerConfig,
+ HttpStatusCode,
+ ServerConfig,
+ VideoPlaylistCreateResult,
+ VideoPlaylistPrivacy,
+ VideoPrivacy
+} from '@shared/models'
import {
cleanupTests,
- doubleFollow,
createMultipleServers,
+ doubleFollow,
makeGetRequest,
makeHTMLRequest,
PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '../../shared/extra-utils'
+} from '../../shared/server-commands'
const expect = chai.expect
@@ -25,7 +32,10 @@ function checkIndexTags (html: string, title: string, description: string, css:
expect(html).to.contain('')
const htmlConfig: HTMLServerConfig = omit(config, 'signup')
- expect(html).to.contain(``)
+ const configObjectString = JSON.stringify(htmlConfig)
+ const configEscapedString = JSON.stringify(configObjectString)
+
+ expect(html).to.contain(``)
}
describe('Test a client controllers', function () {
@@ -46,6 +56,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 () {
@@ -64,7 +78,7 @@ describe('Test a client controllers', function () {
attributes: { description: channelDescription }
})
- // Video
+ // Public video
{
const attributes = { name: videoName, description: videoDescription }
@@ -78,6 +92,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
{
@@ -114,13 +134,13 @@ describe('Test a client controllers', function () {
url: servers[0].url,
path: basePath + id,
accept: 'text/html',
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
const port = servers[0].port
const expectedLink = '`
expect(res.text).to.contain(expectedLink)
@@ -135,13 +155,13 @@ describe('Test a client controllers', function () {
url: servers[0].url,
path: basePath + id,
accept: 'text/html',
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
const port = servers[0].port
const expectedLink = '`
expect(res.text).to.contain(expectedLink)
@@ -153,7 +173,7 @@ describe('Test a client controllers', function () {
describe('Open Graph', function () {
async function accountPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain(``)
@@ -163,7 +183,7 @@ describe('Test a client controllers', function () {
}
async function channelPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain(``)
@@ -173,23 +193,23 @@ describe('Test a client controllers', function () {
}
async function watchVideoPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain(``)
expect(text).to.contain(``)
expect(text).to.contain('')
- expect(text).to.contain(``)
+ expect(text).to.contain(``)
}
async function watchPlaylistPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain(``)
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 () {
@@ -226,7 +246,7 @@ describe('Test a client controllers', function () {
describe('Not whitelisted', function () {
async function accountPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -236,7 +256,7 @@ describe('Test a client controllers', function () {
}
async function channelPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -246,7 +266,7 @@ describe('Test a client controllers', function () {
}
async function watchVideoPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -256,7 +276,7 @@ describe('Test a client controllers', function () {
}
async function watchPlaylistPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -307,7 +327,7 @@ describe('Test a client controllers', function () {
})
async function accountPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -315,7 +335,7 @@ describe('Test a client controllers', function () {
}
async function channelPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -323,7 +343,7 @@ describe('Test a client controllers', function () {
}
async function watchVideoPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -331,7 +351,7 @@ describe('Test a client controllers', function () {
}
async function watchPlaylistPageTest (path: string) {
- const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+ const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', expectedStatus: HttpStatusCode.OK_200 })
const text = res.text
expect(text).to.contain('')
@@ -446,6 +466,70 @@ describe('Test a client controllers', function () {
}
}
})
+
+ it('Should add noindex meta tag for remote accounts', async function () {
+ const handle = 'root@' + servers[0].host
+ const paths = [ '/accounts/', '/a/', '/@' ]
+
+ for (const path of paths) {
+ {
+ const { text } = await makeHTMLRequest(servers[1].url, path + handle)
+ expect(text).to.contain('')
+ }
+
+ {
+ const { text } = await makeHTMLRequest(servers[0].url, path + handle)
+ expect(text).to.not.contain('')
+ }
+ }
+ })
+
+ it('Should add noindex meta tag for remote channels', async function () {
+ const handle = 'root_channel@' + servers[0].host
+ const paths = [ '/video-channels/', '/c/', '/@' ]
+
+ for (const path of paths) {
+ {
+ const { text } = await makeHTMLRequest(servers[1].url, path + handle)
+ expect(text).to.contain('')
+ }
+
+ {
+ const { text } = await makeHTMLRequest(servers[0].url, path + handle)
+ expect(text).to.not.contain('')
+ }
+ }
+ })
+
+ 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 () {