X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=253a9562432a75e047839f0997caf03cf23dd3ba;hb=9de33c6bd9580ab43cc7bc089c54b2fe2bdfd72d;hp=7572fd34a5bb48c7c3b558a946bd59b517f2c670;hpb=a59f210ff3a4cc87dd19aeaaf0f43f63a8310791;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/client.ts b/server/tests/client.ts
index 7572fd34a..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, 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,
@@ -11,8 +13,10 @@ import {
   doubleFollow,
   flushAndRunMultipleServers,
   getAccount,
+  getConfig,
   getCustomConfig,
   getVideosList,
+  makeGetRequest,
   makeHTMLRequest,
   ServerInfo,
   setAccessTokensToServers,
@@ -24,14 +28,16 @@ import {
   uploadVideo,
   waitJobs
 } from '../../shared/extra-utils'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
 
 const expect = chai.expect
 
-function checkIndexTags (html: string, title: string, description: string, css: string) {
+function checkIndexTags (html: string, title: string, description: string, css: string, config: ServerConfig) {
   expect(html).to.contain('<title>' + title + '</title>')
   expect(html).to.contain('<meta name="description" content="' + description + '" />')
   expect(html).to.contain('<style class="custom-css-style">' + css + '</style>')
+
+  const htmlConfig: HTMLServerConfig = omit(config, 'signup')
+  expect(html).to.contain(`<script type="application/javascript">window.PeerTubeServerConfig = '${JSON.stringify(htmlConfig)}'</script>`)
 }
 
 describe('Test a client controllers', function () {
@@ -39,7 +45,8 @@ describe('Test a client controllers', function () {
   let account: Account
 
   const videoName = 'my super name for server 1'
-  const videoDescription = 'my super description for server 1'
+  const videoDescription = 'my<br> super __description__ for *server* 1<p></p>'
+  const videoDescriptionPlainText = 'my super description for server 1'
 
   const playlistName = 'super playlist name'
   const playlistDescription = 'super playlist description'
@@ -47,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)
 
@@ -104,201 +114,258 @@ 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 = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
-        `url=http%3A%2F%2Flocalhost%3A${port}%2Fvideos%2Fwatch%2F${servers[0].video.uuid}" ` +
-        `title="${servers[0].video.name}" />`
+        const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
+          `url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2F${servers[0].video.uuid}" ` +
+          `title="${servers[0].video.name}" />`
 
-      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 = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
-        `url=http%3A%2F%2Flocalhost%3A${port}%2Fvideos%2Fwatch%2Fplaylist%2F${playlistUUID}" ` +
-        `title="${playlistName}" />`
+        const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
+          `url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2Fp%2F${playlistUUID}" ` +
+          `title="${playlistName}" />`
 
-      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 res = await request(servers[0].url)
-        .get('/accounts/' + servers[0].user.username)
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
-
-      expect(res.text).to.contain(`<meta property="og:title" content="${account.displayName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${account.description}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="website" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/accounts/${servers[0].user.username}" />`)
-    })
+    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 Open Graph tags on the channel page', async function () {
-      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(`<meta property="og:title" content="${servers[0].videoChannel.displayName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${channelDescription}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="website" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/video-channels/${servers[0].videoChannel.name}" />`)
-    })
+      expect(text).to.contain(`<meta property="og:title" content="${account.displayName}" />`)
+      expect(text).to.contain(`<meta property="og:description" content="${account.description}" />`)
+      expect(text).to.contain('<meta property="og:type" content="website" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/accounts/${servers[0].user.username}" />`)
+    }
+
+    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
+
+      expect(text).to.contain(`<meta property="og:title" content="${servers[0].videoChannel.displayName}" />`)
+      expect(text).to.contain(`<meta property="og:description" content="${channelDescription}" />`)
+      expect(text).to.contain('<meta property="og:type" content="website" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/video-channels/${servers[0].videoChannel.name}" />`)
+    }
+
+    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
+
+      expect(text).to.contain(`<meta property="og:title" content="${videoName}" />`)
+      expect(text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
+      expect(text).to.contain('<meta property="og:type" content="video" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/${servers[0].video.uuid}" />`)
+    }
+
+    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(`<meta property="og:title" content="${playlistName}" />`)
+      expect(text).to.contain(`<meta property="og:description" content="${playlistDescription}" />`)
+      expect(text).to.contain('<meta property="og:type" content="video" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/p/${playlistUUID}" />`)
+    }
 
-      expect(res.text).to.contain(`<meta property="og:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${videoDescription}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="video" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
+    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(`<meta property="og:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${videoDescription}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="video" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
+    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(`<meta property="og:title" content="${playlistName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${playlistDescription}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="video" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/videos/watch/playlist/${playlistUUID}" />`)
+      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('<meta property="twitter:card" content="summary_large_image" />')
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${videoDescription}" />`)
-    })
+      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('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        expect(text).to.contain(`<meta property="twitter:title" content="${account.name}" />`)
+        expect(text).to.contain(`<meta property="twitter:description" content="${account.description}" />`)
+      }
 
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary" />')
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${playlistName}" />`)
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${playlistDescription}" />`)
-    })
+      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 res = await request(servers[0].url)
-        .get('/accounts/' + account.name)
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        expect(text).to.contain(`<meta property="twitter:title" content="${servers[0].videoChannel.displayName}" />`)
+        expect(text).to.contain(`<meta property="twitter:description" content="${channelDescription}" />`)
+      }
 
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary" />')
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${account.name}" />`)
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${account.description}" />`)
-    })
+      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
+
+        expect(text).to.contain('<meta property="twitter:card" content="summary_large_image" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        expect(text).to.contain(`<meta property="twitter:title" content="${videoName}" />`)
+        expect(text).to.contain(`<meta property="twitter:description" content="${videoDescriptionPlainText}" />`)
+      }
 
-    it('Should have valid twitter card on the channel page', async function () {
-      const res = await request(servers[0].url)
-        .get('/video-channels/' + 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
+
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        expect(text).to.contain(`<meta property="twitter:title" content="${playlistName}" />`)
+        expect(text).to.contain(`<meta property="twitter:description" content="${playlistDescription}" />`)
+      }
+
+      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)
+      })
 
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary" />')
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${servers[0].videoChannel.displayName}" />`)
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${channelDescription}" />`)
+      it('Should have valid twitter card on the watch playlist page', async function () {
+        await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID)
+        await watchPlaylistPageTest('/w/p/' + playlistUUID)
+      })
+
+      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
+    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
+        }
+
+        await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
+      })
+
+      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
+
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
       }
-      await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
 
-      const resVideoRequest = await request(servers[0].url)
-        .get('/videos/watch/' + servers[0].video.uuid)
-        .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
+
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      }
 
-      expect(resVideoRequest.text).to.contain('<meta property="twitter:card" content="player" />')
-      expect(resVideoRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      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
 
-      const resVideoPlaylistRequest = await request(servers[0].url)
-        .get('/videos/watch/playlist/' + playlistUUID)
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
+        expect(text).to.contain('<meta property="twitter:card" content="player" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      }
 
-      expect(resVideoPlaylistRequest.text).to.contain('<meta property="twitter:card" content="player" />')
-      expect(resVideoPlaylistRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      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 resAccountRequest = await request(servers[0].url)
-        .get('/accounts/' + account.name)
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
+        expect(text).to.contain('<meta property="twitter:card" content="player" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      }
 
-      expect(resAccountRequest.text).to.contain('<meta property="twitter:card" content="summary" />')
-      expect(resAccountRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      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)
+      })
 
-      const resChannelRequest = 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 playlist page', async function () {
+        await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID)
+        await watchPlaylistPageTest('/w/p/' + playlistUUID)
+      })
 
-      expect(resChannelRequest.text).to.contain('<meta property="twitter:card" content="summary" />')
-      expect(resChannelRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      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)
+      })
     })
   })
 
   describe('Index HTML', function () {
 
     it('Should have valid index html tags (title, description...)', async function () {
+      const resConfig = await getConfig(servers[0].url)
       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, '')
+      checkIndexTags(res.text, 'PeerTube', description, '', resConfig.body)
     })
 
     it('Should update the customized configuration and have the correct index html tags', async function () {
@@ -308,8 +375,8 @@ describe('Test a client controllers', function () {
           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; }'
@@ -317,35 +384,61 @@ describe('Test a client controllers', function () {
         }
       })
 
+      const resConfig = await getConfig(servers[0].url)
       const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
 
-      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }', resConfig.body)
     })
 
     it('Should have valid index html updated tags (title, description...)', async function () {
+      const resConfig = await getConfig(servers[0].url)
       const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
 
-      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }', resConfig.body)
     })
 
     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(`<link rel="canonical" href="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
+      for (const basePath of watchVideoBasePaths) {
+        const res = await makeHTMLRequest(servers[1].url, basePath + servers[0].video.uuid)
+        expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
+      }
     })
 
     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(`<link rel="canonical" href="${servers[0].url}/accounts/root" />`)
+      const accountURLtest = (res) => {
+        expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/accounts/root" />`)
+      }
+
+      accountURLtest(await makeHTMLRequest(servers[1].url, '/accounts/root@' + servers[0].host))
+      accountURLtest(await makeHTMLRequest(servers[1].url, '/a/root@' + servers[0].host))
+      accountURLtest(await makeHTMLRequest(servers[1].url, '/@root@' + servers[0].host))
     })
 
     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(`<link rel="canonical" href="${servers[0].url}/video-channels/root_channel" />`)
+      const channelURLtests = (res) => {
+        expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/video-channels/root_channel" />`)
+      }
+
+      channelURLtests(await makeHTMLRequest(servers[1].url, '/video-channels/root_channel@' + servers[0].host))
+      channelURLtests(await makeHTMLRequest(servers[1].url, '/c/root_channel@' + servers[0].host))
+      channelURLtests(await makeHTMLRequest(servers[1].url, '/@root_channel@' + servers[0].host))
     })
 
     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(`<link rel="canonical" href="${servers[0].url}/video-playlists/${playlistUUID}" />`)
+      for (const basePath of watchPlaylistBasePaths) {
+        const res = await makeHTMLRequest(servers[1].url, basePath + playlistUUID)
+        expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/video-playlists/${playlistUUID}" />`)
+      }
+    })
+  })
+
+  describe('Embed HTML', function () {
+
+    it('Should have the correct embed html tags', async function () {
+      const resConfig = await getConfig(servers[0].url)
+      const res = await makeHTMLRequest(servers[0].url, servers[0].video.embedPath)
+
+      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }', resConfig.body)
     })
   })