X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fservices.ts;h=69d030dbb8d4a585adb7af0a871464e909c4153d;hb=ac27887774e63d99f4e227fbe18846f143cc4b3c;hp=df910c11149317013247ab1d7e6274ced4035a7d;hpb=6302d599cdf98b5a5363a2a1dcdc266447950191;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts
index df910c111..69d030dbb 100644
--- a/server/tests/api/server/services.ts
+++ b/server/tests/api/server/services.ts
@@ -2,62 +2,48 @@
import 'mocha'
import * as chai from 'chai'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/extra-utils'
import { Video, VideoPlaylistPrivacy } from '@shared/models'
-import {
- addVideoInPlaylist,
- createVideoPlaylist,
- getOEmbed,
- getVideosList,
- ServerInfo,
- setAccessTokensToServers,
- setDefaultVideoChannel,
- uploadVideo
-} from '../../../../shared/extra-utils'
-import { cleanupTests, flushAndRunServer } from '../../../../shared/extra-utils/server/servers'
const expect = chai.expect
describe('Test services', function () {
- let server: ServerInfo = null
+ let server: PeerTubeServer = null
let playlistUUID: string
+ let playlistDisplayName: string
let video: Video
before(async function () {
this.timeout(30000)
- server = await flushAndRunServer(1)
+ server = await createSingleServer(1)
await setAccessTokensToServers([ server ])
await setDefaultVideoChannel([ server ])
{
- const videoAttributes = {
- name: 'my super name'
- }
- await uploadVideo(server.url, server.accessToken, videoAttributes)
+ const attributes = { name: 'my super name' }
+ await server.videos.upload({ attributes })
- const res = await getVideosList(server.url)
- video = res.body.data[0]
+ const { data } = await server.videos.list()
+ video = data[0]
}
{
- const res = await createVideoPlaylist({
- url: server.url,
- token: server.accessToken,
- playlistAttrs: {
+ const created = await server.playlists.create({
+ attributes: {
displayName: 'The Life and Times of Scrooge McDuck',
privacy: VideoPlaylistPrivacy.PUBLIC,
- videoChannelId: server.videoChannel.id
+ videoChannelId: server.store.channel.id
}
})
- playlistUUID = res.body.videoPlaylist.uuid
+ playlistUUID = created.uuid
+ playlistDisplayName = 'The Life and Times of Scrooge McDuck'
- await addVideoInPlaylist({
- url: server.url,
- token: server.accessToken,
- playlistId: res.body.videoPlaylist.id,
- elementAttrs: {
+ await server.playlists.addElement({
+ playlistId: created.id,
+ attributes: {
videoId: video.id
}
})
@@ -65,61 +51,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 = ''
- 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 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)
+ }
})
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 = ''
-
- 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(223)
- expect(res.body.thumbnail_height).to.equal(122)
+ 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)
+ }
})
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 = ''
-
- 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 server.services.getOEmbed({ oembedUrl, format, maxHeight, maxWidth })
+ const expectedHtml = ''
+
+ 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.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 () {