Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / services.ts

diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts
index 680e7a81785a3f7522142b942289d7c33580a334..f0fa91674c03a344d4ca67eeeb8d1d3a423272d8 100644 (file)
--- a/server/tests/api/server/services.ts
+++ b/server/tests/api/server/services.ts
@@ -2,24 +2,26 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { Video, VideoPlaylistPrivacy } from '@shared/models'
 import {
+  addVideoInPlaylist,
+  createVideoPlaylist,
   getOEmbed,
   getVideosList,
   ServerInfo,
   setAccessTokensToServers,
   setDefaultVideoChannel,
-  uploadVideo,
-  createVideoPlaylist,
-  addVideoInPlaylist
+  uploadVideo
 } from '../../../../shared/extra-utils'
 import { cleanupTests, flushAndRunServer } from '../../../../shared/extra-utils/server/servers'
-import { VideoPlaylistPrivacy } from '@shared/models'
 
 const expect = chai.expect
 
 describe('Test services', function () {
   let server: ServerInfo = null
   let playlistUUID: string
+  let playlistDisplayName: string
+  let video: Video
 
   before(async function () {
     this.timeout(30000)
@@ -36,7 +38,7 @@ describe('Test services', function () {
       await uploadVideo(server.url, server.accessToken, videoAttributes)
 
       const res = await getVideosList(server.url)
-      server.video = res.body.data[0]
+      video = res.body.data[0]
     }
 
     {
@@ -51,29 +53,30 @@ describe('Test services', function () {
       })
 
       playlistUUID = res.body.videoPlaylist.uuid
+      playlistDisplayName = 'The Life and Times of Scrooge McDuck'
 
       await addVideoInPlaylist({
         url: server.url,
         token: server.accessToken,
         playlistId: res.body.videoPlaylist.id,
         elementAttrs: {
-          videoId: server.video.id
+          videoId: video.id
         }
       })
     }
   })
 
   it('Should have a valid oEmbed video response', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/' + server.video.uuid
+    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" ' +
-      `src="http://localhost:${server.port}/videos/embed/${server.video.uuid}" ` +
+      `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
       'frameborder="0" allowfullscreen></iframe>'
-    const expectedThumbnailUrl = 'http://localhost:' + server.port + '/lazy-static/previews/' + server.video.uuid + '.jpg'
+    const expectedThumbnailUrl = 'http://localhost:' + server.port + video.previewPath
 
     expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal(server.video.name)
+    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)
@@ -87,7 +90,7 @@ describe('Test services', function () {
 
     const res = await getOEmbed(server.url, oembedUrl)
     const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
-      `src="http://localhost:${server.port}/video-playlists/embed/${playlistUUID}" ` +
+      `title="${playlistDisplayName}" src="http://localhost:${server.port}/video-playlists/embed/${playlistUUID}" ` +
       'frameborder="0" allowfullscreen></iframe>'
 
     expect(res.body.html).to.equal(expectedHtml)
@@ -96,23 +99,23 @@ describe('Test services', function () {
     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(223)
-    expect(res.body.thumbnail_height).to.equal(122)
+    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/' + server.video.uuid
+    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" ' +
-      `src="http://localhost:${server.port}/videos/embed/${server.video.uuid}" ` +
+      `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(server.video.name)
+    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)