X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fservices.ts;h=2f95f953be4ed7aa5c34c3f28c3e6287c3c23255;hb=4e56f0fff12ab9840574e7a27277fc78b195b3e2;hp=69d030dbb8d4a585adb7af0a871464e909c4153d;hpb=421ff4618da64f0849353383f690a014024c40da;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts
index 69d030dbb..2f95f953b 100644
--- a/server/tests/api/server/services.ts
+++ b/server/tests/api/server/services.ts
@@ -2,7 +2,7 @@
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands'
import { Video, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
@@ -13,6 +13,21 @@ describe('Test services', function () {
let playlistDisplayName: string
let video: Video
+ const urlSuffixes = [
+ {
+ input: '',
+ output: ''
+ },
+ {
+ input: '?param=1',
+ output: ''
+ },
+ {
+ input: '?muted=1&warningTitle=0&toto=1',
+ output: '?muted=1&warningTitle=0'
+ }
+ ]
+
before(async function () {
this.timeout(30000)
@@ -52,55 +67,60 @@ 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 = ''
- 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 urlSuffixes) {
+ const oembedUrl = server.url + basePath + video.uuid + suffix.input
+
+ const res = await server.services.getOEmbed({ oembedUrl })
+ const expectedHtml = ''
+
+ const expectedThumbnailUrl = 'http://' + server.host + 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 = ''
-
- 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 urlSuffixes) {
+ const oembedUrl = server.url + basePath + playlistUUID + suffix.input
+
+ const res = await server.services.getOEmbed({ oembedUrl })
+ const expectedHtml = ''
+
+ 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)
+ }
}
})
it('Should have a valid oEmbed response with small max height query', async function () {
for (const basePath of [ '/videos/watch/', '/w/' ]) {
- const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid
+ const oembedUrl = 'http://' + server.host + basePath + video.uuid
const format = 'json'
const maxHeight = 50
const maxWidth = 50
const res = await server.services.getOEmbed({ oembedUrl, format, maxHeight, maxWidth })
- const expectedHtml = ''
expect(res.body.html).to.equal(expectedHtml)