2 files changed, 165 insertions, 135 deletions

diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts
index f0fa91674..ea64e4040 100644
--- a/server/tests/api/server/services.ts
+++ b/server/tests/api/server/services.ts
@@ -67,61 +67,67 @@ describe('Test services', function () {
   })
 
   it('Should have a valid oEmbed video response', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/' + video.uuid
-
-    const res = await getOEmbed(server.url, oembedUrl)
-    const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
-      `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
-      'frameborder="0" allowfullscreen></iframe>'
-    const expectedThumbnailUrl = 'http://localhost:' + server.port + video.previewPath
-
-    expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal(video.name)
-    expect(res.body.author_name).to.equal(server.videoChannel.displayName)
-    expect(res.body.width).to.equal(560)
-    expect(res.body.height).to.equal(315)
-    expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl)
-    expect(res.body.thumbnail_width).to.equal(850)
-    expect(res.body.thumbnail_height).to.equal(480)
+    for (const basePath of [ '/videos/watch/', '/w/' ]) {
+      const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid
+
+      const res = await getOEmbed(server.url, oembedUrl)
+      const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
+        `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
+        'frameborder="0" allowfullscreen></iframe>'
+      const expectedThumbnailUrl = 'http://localhost:' + server.port + video.previewPath
+
+      expect(res.body.html).to.equal(expectedHtml)
+      expect(res.body.title).to.equal(video.name)
+      expect(res.body.author_name).to.equal(server.videoChannel.displayName)
+      expect(res.body.width).to.equal(560)
+      expect(res.body.height).to.equal(315)
+      expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl)
+      expect(res.body.thumbnail_width).to.equal(850)
+      expect(res.body.thumbnail_height).to.equal(480)
+    }
   })
 
   it('Should have a valid playlist oEmbed response', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/playlist/' + playlistUUID
-
-    const res = await getOEmbed(server.url, oembedUrl)
-    const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
-      `title="${playlistDisplayName}" src="http://localhost:${server.port}/video-playlists/embed/${playlistUUID}" ` +
-      'frameborder="0" allowfullscreen></iframe>'
-
-    expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal('The Life and Times of Scrooge McDuck')
-    expect(res.body.author_name).to.equal(server.videoChannel.displayName)
-    expect(res.body.width).to.equal(560)
-    expect(res.body.height).to.equal(315)
-    expect(res.body.thumbnail_url).exist
-    expect(res.body.thumbnail_width).to.equal(280)
-    expect(res.body.thumbnail_height).to.equal(157)
+    for (const basePath of [ '/videos/watch/playlist/', '/w/p/' ]) {
+      const oembedUrl = 'http://localhost:' + server.port + basePath + playlistUUID
+
+      const res = await getOEmbed(server.url, oembedUrl)
+      const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
+        `title="${playlistDisplayName}" src="http://localhost:${server.port}/video-playlists/embed/${playlistUUID}" ` +
+        'frameborder="0" allowfullscreen></iframe>'
+
+      expect(res.body.html).to.equal(expectedHtml)
+      expect(res.body.title).to.equal('The Life and Times of Scrooge McDuck')
+      expect(res.body.author_name).to.equal(server.videoChannel.displayName)
+      expect(res.body.width).to.equal(560)
+      expect(res.body.height).to.equal(315)
+      expect(res.body.thumbnail_url).exist
+      expect(res.body.thumbnail_width).to.equal(280)
+      expect(res.body.thumbnail_height).to.equal(157)
+    }
   })
 
   it('Should have a valid oEmbed response with small max height query', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/' + video.uuid
-    const format = 'json'
-    const maxHeight = 50
-    const maxWidth = 50
-
-    const res = await getOEmbed(server.url, oembedUrl, format, maxHeight, maxWidth)
-    const expectedHtml = '<iframe width="50" height="50" sandbox="allow-same-origin allow-scripts" ' +
-      `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
-      'frameborder="0" allowfullscreen></iframe>'
-
-    expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal(video.name)
-    expect(res.body.author_name).to.equal(server.videoChannel.displayName)
-    expect(res.body.height).to.equal(50)
-    expect(res.body.width).to.equal(50)
-    expect(res.body).to.not.have.property('thumbnail_url')
-    expect(res.body).to.not.have.property('thumbnail_width')
-    expect(res.body).to.not.have.property('thumbnail_height')
+    for (const basePath of [ '/videos/watch/', '/w/' ]) {
+      const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid
+      const format = 'json'
+      const maxHeight = 50
+      const maxWidth = 50
+
+      const res = await getOEmbed(server.url, oembedUrl, format, maxHeight, maxWidth)
+      const expectedHtml = '<iframe width="50" height="50" sandbox="allow-same-origin allow-scripts" ' +
+        `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
+        'frameborder="0" allowfullscreen></iframe>'
+
+      expect(res.body.html).to.equal(expectedHtml)
+      expect(res.body.title).to.equal(video.name)
+      expect(res.body.author_name).to.equal(server.videoChannel.displayName)
+      expect(res.body.height).to.equal(50)
+      expect(res.body.width).to.equal(50)
+      expect(res.body).to.not.have.property('thumbnail_url')
+      expect(res.body).to.not.have.property('thumbnail_width')
+      expect(res.body).to.not.have.property('thumbnail_height')
+    }
   })
 
   after(async function () {
diff --git a/server/tests/client.ts b/server/tests/client.ts
index f33e5c1da..253a95624 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -54,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)
 
@@ -111,35 +114,40 @@ 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)
+      }
     })
   })
 
@@ -165,6 +173,26 @@ describe('Test a client controllers', function () {
       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
+
+      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}" />`)
+    }
+
     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)
@@ -177,40 +205,16 @@ describe('Test a client controllers', function () {
       await channelPageTest('/@' + servers[0].videoChannel.name)
     })
 
-    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(res.text).to.contain(`<meta property="og:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
-      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 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)
-
-      expect(res.text).to.contain(`<meta property="og:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
-      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)
     })
   })
 
@@ -238,28 +242,36 @@ describe('Test a client controllers', function () {
         expect(text).to.contain(`<meta property="twitter:description" content="${channelDescription}" />`)
       }
 
-      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)
+      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(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="${videoDescriptionPlainText}" />`)
+        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}" />`)
+      }
+
+      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)
       })
 
       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(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}" />`)
+        await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID)
+        await watchPlaylistPageTest('/w/p/' + playlistUUID)
       })
 
       it('Should have valid twitter card on the account page', async function () {
@@ -304,24 +316,32 @@ describe('Test a client controllers', function () {
         expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
       }
 
-      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)
+      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(res.text).to.contain('<meta property="twitter:card" content="player" />')
-        expect(res.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+        expect(text).to.contain('<meta property="twitter:card" content="player" />')
+        expect(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
+
+        expect(text).to.contain('<meta property="twitter:card" content="player" />')
+        expect(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)
       })
 
       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(res.text).to.contain('<meta property="twitter:card" content="player" />')
-        expect(res.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+        await watchPlaylistPageTest('/videos/watch/playlist/' + playlistUUID)
+        await watchPlaylistPageTest('/w/p/' + playlistUUID)
       })
 
       it('Should have valid twitter card on the account page', async function () {
@@ -378,8 +398,10 @@ describe('Test a client controllers', function () {
     })
 
     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 () {
@@ -403,8 +425,10 @@ describe('Test a client controllers', function () {
     })
 
     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}" />`)
+      }
     })
   })