X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fvideos%2Fvideos.ts;h=095d4e29dab2ad39548d427abf8fc61e88d64eba;hb=fd206f0b2d7e5c8e00e2817266d90ec54f79e1da;hp=17c3dbc15a67d4f6bd96fe1a132a328c11a082b7;hpb=a20399c972d7f9512f77a654773f9c160db07d5c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 17c3dbc15..095d4e29d 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -3,10 +3,11 @@ import { expect } from 'chai' import { readFile } from 'fs' import * as parseTorrent from 'parse-torrent' -import { isAbsolute, join } from 'path' +import { extname, isAbsolute, join } from 'path' import * as request from 'supertest' -import { getMyUserInformation, makeGetRequest, readFilePromise, ServerInfo } from '../' +import { getMyUserInformation, makeGetRequest, ServerInfo } from '../' import { VideoPrivacy } from '../../../../shared/models/videos' +import { readFileBufferPromise } from '../../../helpers/core-utils' import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers' import { dateIsValid, webtorrentAdd } from '../index' @@ -16,6 +17,7 @@ type VideoAttributes = { licence?: number language?: number nsfw?: boolean + commentsEnabled?: boolean description?: string tags?: string[] channelId?: number @@ -201,7 +203,7 @@ function searchVideoWithSort (url: string, search: string, sort: string) { .expect('Content-Type', /json/) } -async function testVideoImage (url: string, imageName: string, imagePath: string) { +async function testVideoImage (url: string, imageName: string, imagePath: string, extension = '.jpg') { // Don't test images if the node env is not set // Because we need a special ffmpeg version for this test if (process.env['NODE_TEST_IMAGE']) { @@ -209,7 +211,7 @@ async function testVideoImage (url: string, imageName: string, imagePath: string .get(imagePath) .expect(200) - const data = await readFilePromise(join(__dirname, '..', '..', 'api', 'fixtures', imageName + '.jpg')) + const data = await readFileBufferPromise(join(__dirname, '..', '..', 'api', 'fixtures', imageName + extension)) return data.equals(res.body) } else { @@ -238,6 +240,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg description: 'my super description', tags: [ 'tag' ], privacy: VideoPrivacy.PUBLIC, + commentsEnabled: true, fixture: 'video_short.webm' } attributes = Object.assign(attributes, videoAttributesArg) @@ -250,6 +253,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .field('category', attributes.category.toString()) .field('licence', attributes.licence.toString()) .field('nsfw', JSON.stringify(attributes.nsfw)) + .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) .field('description', attributes.description) .field('privacy', attributes.privacy.toString()) .field('channelId', attributes.channelId) @@ -273,7 +277,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .expect(specialStatus) } -function updateVideo (url: string, accessToken: string, id: number, attributes: VideoAttributes, specialStatus = 204) { +function updateVideo (url: string, accessToken: string, id: number | string, attributes: VideoAttributes, specialStatus = 204) { const path = '/api/v1/videos/' + id const body = {} @@ -281,7 +285,8 @@ function updateVideo (url: string, accessToken: string, id: number, attributes: if (attributes.category) body['category'] = attributes.category if (attributes.licence) body['licence'] = attributes.licence if (attributes.language) body['language'] = attributes.language - if (attributes.nsfw) body['nsfw'] = attributes.nsfw + if (attributes.nsfw !== undefined) body['nsfw'] = JSON.stringify(attributes.nsfw) + if (attributes.commentsEnabled !== undefined) body['commentsEnabled'] = JSON.stringify(attributes.commentsEnabled) if (attributes.description) body['description'] = attributes.description if (attributes.tags) body['tags'] = attributes.tags if (attributes.privacy) body['privacy'] = attributes.privacy @@ -326,14 +331,19 @@ async function completeVideoCheck ( licence: number language: number nsfw: boolean + commentsEnabled: boolean description: string host: string account: string isLocal: boolean, tags: string[], privacy: number, + likes?: number, + dislikes?: number, + duration: number, channel: { name: string, + description isLocal: boolean } fixture: string, @@ -343,18 +353,24 @@ async function completeVideoCheck ( }[] } ) { + if (!attributes.likes) attributes.likes = 0 + if (!attributes.dislikes) attributes.dislikes = 0 + expect(video.name).to.equal(attributes.name) expect(video.category).to.equal(attributes.category) - expect(video.categoryLabel).to.equal(VIDEO_CATEGORIES[attributes.category]) + expect(video.categoryLabel).to.equal(VIDEO_CATEGORIES[attributes.category] || 'Misc') expect(video.licence).to.equal(attributes.licence) - expect(video.licenceLabel).to.equal(VIDEO_LICENCES[attributes.licence]) + expect(video.licenceLabel).to.equal(VIDEO_LICENCES[attributes.licence] || 'Unknown') expect(video.language).to.equal(attributes.language) - expect(video.languageLabel).to.equal(VIDEO_LANGUAGES[attributes.language]) + expect(video.languageLabel).to.equal(VIDEO_LANGUAGES[attributes.language] || 'Unknown') expect(video.nsfw).to.equal(attributes.nsfw) expect(video.description).to.equal(attributes.description) expect(video.serverHost).to.equal(attributes.host) expect(video.accountName).to.equal(attributes.account) + expect(video.likes).to.equal(attributes.likes) + expect(video.dislikes).to.equal(attributes.dislikes) expect(video.isLocal).to.equal(attributes.isLocal) + expect(video.duration).to.equal(attributes.duration) expect(dateIsValid(video.createdAt)).to.be.true expect(dateIsValid(video.updatedAt)).to.be.true @@ -366,8 +382,10 @@ async function completeVideoCheck ( expect(videoDetails.privacy).to.deep.equal(attributes.privacy) expect(videoDetails.privacyLabel).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy]) expect(videoDetails.account.name).to.equal(attributes.account) + expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) - expect(videoDetails.channel.name).to.equal(attributes.channel.name) + expect(videoDetails.channel.displayName).to.equal(attributes.channel.name) + expect(videoDetails.channel.name).to.have.lengthOf(36) expect(videoDetails.channel.isLocal).to.equal(attributes.channel.isLocal) expect(dateIsValid(videoDetails.channel.createdAt)).to.be.true expect(dateIsValid(videoDetails.channel.updatedAt)).to.be.true @@ -376,13 +394,20 @@ async function completeVideoCheck ( const file = videoDetails.files.find(f => f.resolution === attributeFile.resolution) expect(file).not.to.be.undefined + let extension = extname(attributes.fixture) + // Transcoding enabled on server 2, extension will always be .mp4 + if (attributes.host === 'localhost:9002') extension = '.mp4' + const magnetUri = file.magnetUri expect(file.magnetUri).to.have.lengthOf.above(2) - expect(file.torrentUrl).to.equal(`${url}/static/torrents/${videoDetails.uuid}-${file.resolution}.torrent`) - expect(file.fileUrl).to.equal(`${url}/static/webseed/${videoDetails.uuid}-${file.resolution}.webm`) + expect(file.torrentUrl).to.equal(`http://${attributes.host}/static/torrents/${videoDetails.uuid}-${file.resolution}.torrent`) + expect(file.fileUrl).to.equal(`http://${attributes.host}/static/webseed/${videoDetails.uuid}-${file.resolution}${extension}`) expect(file.resolution).to.equal(attributeFile.resolution) expect(file.resolutionLabel).to.equal(attributeFile.resolution + 'p') - expect(file.size).to.equal(attributeFile.size) + + const minSize = attributeFile.size - ((10 * attributeFile.size) / 100) + const maxSize = attributeFile.size + ((10 * attributeFile.size) / 100) + expect(file.size).to.be.above(minSize).and.below(maxSize) const test = await testVideoImage(url, attributes.fixture, videoDetails.thumbnailPath) expect(test).to.equal(true)