From 7d786e5c1621e1aa41db1d6e7244f16df7343d45 Mon Sep 17 00:00:00 2001 From: Chocobozzz <me@florianbigard.com> Date: Fri, 8 Oct 2021 14:49:15 +0200 Subject: Handle oembed with params in URL --- server/tests/api/server/services.ts | 66 ++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 31 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts index 69d030dbb..3a87df981 100644 --- a/server/tests/api/server/services.ts +++ b/server/tests/api/server/services.ts @@ -52,42 +52,46 @@ describe('Test services', function () { it('Should have a valid oEmbed video response', async function () { for (const basePath of [ '/videos/watch/', '/w/' ]) { - const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid - - const res = await server.services.getOEmbed({ 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.store.channel.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 suffix of [ '', '?param=1' ]) { + const oembedUrl = server.url + basePath + video.uuid + suffix + + const res = await server.services.getOEmbed({ 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.store.channel.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 () { for (const basePath of [ '/videos/watch/playlist/', '/w/p/' ]) { - const oembedUrl = 'http://localhost:' + server.port + basePath + playlistUUID - - const res = await server.services.getOEmbed({ 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.store.channel.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 suffix of [ '', '?param=1' ]) { + const oembedUrl = server.url + basePath + playlistUUID + suffix + + const res = await server.services.getOEmbed({ 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.store.channel.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) + } } }) -- cgit v1.2.3