X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=d608764eed708664f21b5cd8b5765eb594b7dcd8;hb=ff9112ad21535938940d48d2355ba6ff43b33df8;hp=6dd4b7cf6096a0dab8e2c0f628f14e946be219de;hpb=2d53be0267acc49cda46707b885096193a1f4e9c;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/client.ts b/server/tests/client.ts
index 6dd4b7cf6..d608764ee 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -8,19 +8,21 @@ import {
addVideoInPlaylist,
cleanupTests,
createVideoPlaylist,
- flushAndRunServer,
+ doubleFollow,
+ flushAndRunMultipleServers,
getAccount,
getCustomConfig,
getVideosList,
makeHTMLRequest,
ServerInfo,
- serverLogin,
+ setAccessTokensToServers,
setDefaultVideoChannel,
updateCustomConfig,
updateCustomSubConfig,
- uploadVideo,
updateMyUser,
- updateVideoChannel
+ updateVideoChannel,
+ uploadVideo,
+ waitJobs
} from '../../shared/extra-utils'
import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
@@ -33,7 +35,7 @@ function checkIndexTags (html: string, title: string, description: string, css:
}
describe('Test a client controllers', function () {
- let server: ServerInfo
+ let servers: ServerInfo[] = []
let account: Account
const videoName = 'my super name for server 1'
@@ -48,22 +50,26 @@ describe('Test a client controllers', function () {
before(async function () {
this.timeout(120000)
- server = await flushAndRunServer(1)
- server.accessToken = await serverLogin(server)
- await setDefaultVideoChannel([ server ])
+ servers = await flushAndRunMultipleServers(2)
+
+ await setAccessTokensToServers(servers)
+
+ await doubleFollow(servers[0], servers[1])
- await updateVideoChannel(server.url, server.accessToken, server.videoChannel.name, { description: channelDescription })
+ await setDefaultVideoChannel(servers)
+
+ await updateVideoChannel(servers[0].url, servers[0].accessToken, servers[0].videoChannel.name, { description: channelDescription })
// Video
const videoAttributes = { name: videoName, description: videoDescription }
- await uploadVideo(server.url, server.accessToken, videoAttributes)
+ await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes)
- const resVideosRequest = await getVideosList(server.url)
+ const resVideosRequest = await getVideosList(servers[0].url)
const videos = resVideosRequest.body.data
expect(videos.length).to.equal(1)
- server.video = videos[0]
+ servers[0].video = videos[0]
// Playlist
@@ -71,54 +77,56 @@ describe('Test a client controllers', function () {
displayName: playlistName,
description: playlistDescription,
privacy: VideoPlaylistPrivacy.PUBLIC,
- videoChannelId: server.videoChannel.id
+ videoChannelId: servers[0].videoChannel.id
}
- const resVideoPlaylistRequest = await createVideoPlaylist({ url: server.url, token: server.accessToken, playlistAttrs })
+ const resVideoPlaylistRequest = await createVideoPlaylist({ url: servers[0].url, token: servers[0].accessToken, playlistAttrs })
const playlist = resVideoPlaylistRequest.body.videoPlaylist
const playlistId = playlist.id
playlistUUID = playlist.uuid
await addVideoInPlaylist({
- url: server.url,
- token: server.accessToken,
+ url: servers[0].url,
+ token: servers[0].accessToken,
playlistId,
- elementAttrs: { videoId: server.video.id }
+ elementAttrs: { videoId: servers[0].video.id }
})
// Account
- await updateMyUser({ url: server.url, accessToken: server.accessToken, description: 'my account description' })
+ await updateMyUser({ url: servers[0].url, accessToken: servers[0].accessToken, description: 'my account description' })
- const resAccountRequest = await getAccount(server.url, `${server.user.username}@${server.host}`)
+ const resAccountRequest = await getAccount(servers[0].url, `${servers[0].user.username}@${servers[0].host}`)
account = resAccountRequest.body
+
+ await waitJobs(servers)
})
describe('oEmbed', function () {
it('Should have valid oEmbed discovery tags for videos', async function () {
- const path = '/videos/watch/' + server.video.uuid
- const res = await request(server.url)
+ 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)
- const port = server.port
+ const port = servers[0].port
const expectedLink = '`
+ `url=http%3A%2F%2Flocalhost%3A${port}%2Fvideos%2Fwatch%2F${servers[0].video.uuid}" ` +
+ `title="${servers[0].video.name}" />`
expect(res.text).to.contain(expectedLink)
})
it('Should have valid oEmbed discovery tags for a playlist', async function () {
- const res = await request(server.url)
+ const res = await request(servers[0].url)
.get('/videos/watch/playlist/' + playlistUUID)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
- const port = server.port
+ const port = servers[0].port
const expectedLink = '`)
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/' + server.videoChannel.name)
+ const res = 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(``)
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 id', async function () {
- const res = await request(server.url)
- .get('/videos/watch/' + server.video.id)
+ const res = await request(servers[0].url)
+ .get('/videos/watch/' + servers[0].video.id)
.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(``)
+ expect(res.text).to.contain(``)
})
it('Should have valid Open Graph tags on the watch page with video uuid', async function () {
- const res = await request(server.url)
- .get('/videos/watch/' + server.video.uuid)
+ const res = await request(servers[0].url)
+ .get('/videos/watch/' + servers[0].video.uuid)
.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(``)
+ 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)
+ const res = await request(servers[0].url)
.get('/videos/watch/playlist/' + playlistUUID)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -187,15 +195,15 @@ 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(``)
+ expect(res.text).to.contain(``)
})
})
describe('Twitter card', async function () {
it('Should have valid twitter card on the watch video page', async function () {
- const res = await request(server.url)
- .get('/videos/watch/' + server.video.uuid)
+ const res = await request(servers[0].url)
+ .get('/videos/watch/' + servers[0].video.uuid)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -206,7 +214,7 @@ describe('Test a client controllers', function () {
})
it('Should have valid twitter card on the watch playlist page', async function () {
- const res = await request(server.url)
+ const res = await request(servers[0].url)
.get('/videos/watch/playlist/' + playlistUUID)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -218,7 +226,7 @@ describe('Test a client controllers', function () {
})
it('Should have valid twitter card on the account page', async function () {
- const res = await request(server.url)
+ const res = await request(servers[0].url)
.get('/accounts/' + account.name)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -230,35 +238,35 @@ describe('Test a client controllers', function () {
})
it('Should have valid twitter card on the channel page', async function () {
- const res = await request(server.url)
- .get('/video-channels/' + server.videoChannel.name)
+ const res = 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('')
- 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 () {
- const res1 = await getCustomConfig(server.url, server.accessToken)
+ const res1 = await getCustomConfig(servers[0].url, servers[0].accessToken)
const config = res1.body
config.services.twitter = {
username: '@Kuja',
whitelisted: true
}
- await updateCustomConfig(server.url, server.accessToken, config)
+ await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
- const resVideoRequest = await request(server.url)
- .get('/videos/watch/' + server.video.uuid)
+ const resVideoRequest = await request(servers[0].url)
+ .get('/videos/watch/' + servers[0].video.uuid)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
expect(resVideoRequest.text).to.contain('')
expect(resVideoRequest.text).to.contain('')
- const resVideoPlaylistRequest = await request(server.url)
+ const resVideoPlaylistRequest = await request(servers[0].url)
.get('/videos/watch/playlist/' + playlistUUID)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -266,7 +274,7 @@ describe('Test a client controllers', function () {
expect(resVideoPlaylistRequest.text).to.contain('')
expect(resVideoPlaylistRequest.text).to.contain('')
- const resAccountRequest = await request(server.url)
+ const resAccountRequest = await request(servers[0].url)
.get('/accounts/' + account.name)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -274,8 +282,8 @@ describe('Test a client controllers', function () {
expect(resAccountRequest.text).to.contain('')
expect(resAccountRequest.text).to.contain('')
- const resChannelRequest = await request(server.url)
- .get('/video-channels/' + server.videoChannel.name)
+ const resChannelRequest = await request(servers[0].url)
+ .get('/video-channels/' + servers[0].videoChannel.name)
.set('Accept', 'text/html')
.expect(HttpStatusCode.OK_200)
@@ -287,21 +295,21 @@ describe('Test a client controllers', function () {
describe('Index HTML', function () {
it('Should have valid index html tags (title, description...)', async function () {
- const res = await makeHTMLRequest(server.url, '/videos/trending')
+ const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
const description = 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
checkIndexTags(res.text, 'PeerTube', description, '')
})
it('Should update the customized configuration and have the correct index html tags', async function () {
- await updateCustomSubConfig(server.url, server.accessToken, {
+ await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
instance: {
name: 'PeerTube updated',
shortDescription: 'my short description',
description: 'my super description',
terms: 'my super terms',
- defaultClientRoute: '/videos/recently-added',
defaultNSFWPolicy: 'blur',
+ defaultClientRoute: '/videos/recently-added',
customizations: {
javascript: 'alert("coucou")',
css: 'body { background-color: red; }'
@@ -309,19 +317,39 @@ describe('Test a client controllers', function () {
}
})
- const res = await makeHTMLRequest(server.url, '/videos/trending')
+ const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
})
it('Should have valid index html updated tags (title, description...)', async function () {
- const res = await makeHTMLRequest(server.url, '/videos/trending')
+ const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
})
+
+ 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(``)
+ })
+
+ it('Should use the original account URL for the canonical tag', async function () {
+ const res = await makeHTMLRequest(servers[1].url, '/accounts/root@' + servers[0].host)
+ expect(res.text).to.contain(``)
+ })
+
+ it('Should use the original channel URL for the canonical tag', async function () {
+ const res = await makeHTMLRequest(servers[1].url, '/video-channels/root_channel@' + servers[0].host)
+ expect(res.text).to.contain(``)
+ })
+
+ 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(``)
+ })
})
after(async function () {
- await cleanupTests([ server ])
+ await cleanupTests(servers)
})
})