X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fvideos%2Fvideos.ts;h=3c63bedb219665760126a5a995b5840fbe456d6b;hb=09700934b90e2ac7b1b9ed1694d9d4d52735e2e1;hp=d6bf27dc7a8b5d10586d48c21cdb3134a6d1979d;hpb=b1f5b93e4f1a9ae9015463c9a4946722ed87ec2e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index d6bf27dc7..3c63bedb2 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -1,12 +1,22 @@ /* tslint:disable:no-unused-expression */ import { expect } from 'chai' -import { readFile } from 'fs' +import { existsSync, readFile } from 'fs' import * as parseTorrent from 'parse-torrent' -import { extname, isAbsolute, join } from 'path' +import { extname, join } from 'path' import * as request from 'supertest' -import { getMyUserInformation, makeGetRequest, readFilePromise, ServerInfo } from '../' +import { + buildAbsoluteFixturePath, + getMyUserInformation, + makeGetRequest, + makePutBodyRequest, + makeUploadRequest, + root, + ServerInfo, + testImage +} from '../' import { VideoPrivacy } from '../../../../shared/models/videos' +import { readdirPromise } from '../../../helpers/core-utils' import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers' import { dateIsValid, webtorrentAdd } from '../index' @@ -16,11 +26,14 @@ type VideoAttributes = { licence?: number language?: number nsfw?: boolean + commentsEnabled?: boolean description?: string tags?: string[] channelId?: number privacy?: VideoPrivacy fixture?: string + thumbnailfile?: string + previewfile?: string } function getVideoCategories (url: string) { @@ -110,6 +123,17 @@ function getVideosList (url: string) { .expect('Content-Type', /json/) } +function getLocalVideos (url: string) { + const path = '/api/v1/videos' + + return request(url) + .get(path) + .query({ sort: 'name', filter: 'local' }) + .set('Accept', 'application/json') + .expect(200) + .expect('Content-Type', /json/) +} + function getMyVideos (url: string, accessToken: string, start: number, count: number, sort?: string) { const path = '/api/v1/users/me/videos' @@ -201,20 +225,19 @@ function searchVideoWithSort (url: string, search: string, sort: string) { .expect('Content-Type', /json/) } -async function testVideoImage (url: string, imageName: string, imagePath: string) { - // 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']) { - const res = await request(url) - .get(imagePath) - .expect(200) +async function checkVideoFilesWereRemoved (videoUUID: string, serverNumber: number) { + const testDirectory = 'test' + serverNumber + + for (const directory of [ 'videos', 'thumbnails', 'torrents', 'previews' ]) { + const directoryPath = join(root(), testDirectory, directory) - const data = await readFilePromise(join(__dirname, '..', '..', 'api', 'fixtures', imageName + '.jpg')) + const directoryExists = existsSync(directoryPath) + expect(directoryExists).to.be.true - return data.equals(res.body) - } else { - console.log('Do not test images. Enable it by setting NODE_TEST_IMAGE env variable.') - return true + const files = await readdirPromise(directoryPath) + for (const file of files) { + expect(file).to.not.contain(videoUUID) + } } } @@ -227,8 +250,8 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg defaultChannelId = res.body.videoChannels[0].id } catch (e) { /* empty */ } - // Default attributes - let attributes = { + // Override default attributes + const attributes = Object.assign({ name: 'my super video', category: 5, licence: 4, @@ -236,44 +259,52 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg channelId: defaultChannelId, nsfw: true, description: 'my super description', + support: 'my super support text', tags: [ 'tag' ], privacy: VideoPrivacy.PUBLIC, + commentsEnabled: true, fixture: 'video_short.webm' - } - attributes = Object.assign(attributes, videoAttributesArg) + }, videoAttributesArg) const req = request(url) .post(path) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + accessToken) .field('name', attributes.name) - .field('category', attributes.category.toString()) - .field('licence', attributes.licence.toString()) .field('nsfw', JSON.stringify(attributes.nsfw)) - .field('description', attributes.description) + .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) .field('privacy', attributes.privacy.toString()) .field('channelId', attributes.channelId) + if (attributes.description !== undefined) { + req.field('description', attributes.description) + } if (attributes.language !== undefined) { req.field('language', attributes.language.toString()) } + if (attributes.category !== undefined) { + req.field('category', attributes.category.toString()) + } + if (attributes.licence !== undefined) { + req.field('licence', attributes.licence.toString()) + } for (let i = 0; i < attributes.tags.length; i++) { req.field('tags[' + i + ']', attributes.tags[i]) } - let filePath = '' - if (isAbsolute(attributes.fixture)) { - filePath = attributes.fixture - } else { - filePath = join(__dirname, '..', '..', 'api', 'fixtures', attributes.fixture) + if (attributes.thumbnailfile !== undefined) { + req.attach('thumbnailfile', buildAbsoluteFixturePath(attributes.thumbnailfile)) + } + if (attributes.previewfile !== undefined) { + req.attach('previewfile', buildAbsoluteFixturePath(attributes.previewfile)) } - return req.attach('videofile', filePath) + return req.attach('videofile', buildAbsoluteFixturePath(attributes.fixture)) .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, statusCodeExpected = 204) { const path = '/api/v1/videos/' + id const body = {} @@ -281,17 +312,36 @@ 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 - return request(url) - .put(path) - .send(body) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + accessToken) - .expect(specialStatus) + // Upload request + if (attributes.thumbnailfile || attributes.previewfile) { + const attaches: any = {} + if (attributes.thumbnailfile) attaches.thumbnailfile = attributes.thumbnailfile + if (attributes.previewfile) attaches.previewfile = attributes.previewfile + + return makeUploadRequest({ + url, + method: 'PUT', + path, + token: accessToken, + fields: body, + attaches, + statusCodeExpected + }) + } + + return makePutBodyRequest({ + url, + path, + fields: body, + token: accessToken, + statusCodeExpected + }) } function rateVideo (url: string, accessToken: string, id: number, rating: string, specialStatus = 204) { @@ -326,9 +376,13 @@ async function completeVideoCheck ( licence: number language: number nsfw: boolean + commentsEnabled: boolean description: string - host: string - account: string + support: string + account: { + name: string + host: string + } isLocal: boolean, tags: string[], privacy: number, @@ -344,23 +398,25 @@ async function completeVideoCheck ( files: { resolution: number size: number - }[] + }[], + thumbnailfile?: string + previewfile?: string } ) { 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] || 'Misc') - expect(video.licence).to.equal(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] || 'Unknown') + expect(video.category.id).to.equal(attributes.category) + expect(video.category.label).to.equal(VIDEO_CATEGORIES[attributes.category] || 'Misc') + expect(video.licence.id).to.equal(attributes.licence) + expect(video.licence.label).to.equal(VIDEO_LICENCES[attributes.licence] || 'Unknown') + expect(video.language.id).to.equal(attributes.language) + expect(video.language.label).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.account.host).to.equal(attributes.account.host) + expect(video.account.name).to.equal(attributes.account.name) expect(video.likes).to.equal(attributes.likes) expect(video.dislikes).to.equal(attributes.dislikes) expect(video.isLocal).to.equal(attributes.isLocal) @@ -368,16 +424,19 @@ async function completeVideoCheck ( expect(dateIsValid(video.createdAt)).to.be.true expect(dateIsValid(video.updatedAt)).to.be.true - const res = await getVideo(url, video.id) + const res = await getVideo(url, video.uuid) const videoDetails = res.body expect(videoDetails.files).to.have.lengthOf(attributes.files.length) expect(videoDetails.tags).to.deep.equal(attributes.tags) - 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.channel.name).to.equal(attributes.channel.name) + expect(videoDetails.privacy.id).to.deep.equal(attributes.privacy) + expect(videoDetails.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy]) + expect(videoDetails.account.name).to.equal(attributes.account.name) + expect(videoDetails.account.host).to.equal(attributes.account.host) + expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) + + 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 @@ -388,21 +447,26 @@ async function completeVideoCheck ( let extension = extname(attributes.fixture) // Transcoding enabled on server 2, extension will always be .mp4 - if (attributes.host === 'localhost:9002') extension = '.mp4' + if (attributes.account.host === 'localhost:9002') extension = '.mp4' const magnetUri = file.magnetUri expect(file.magnetUri).to.have.lengthOf.above(2) - 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.torrentUrl).to.equal(`http://${attributes.account.host}/static/torrents/${videoDetails.uuid}-${file.resolution}.torrent`) + expect(file.fileUrl).to.equal(`http://${attributes.account.host}/static/webseed/${videoDetails.uuid}-${file.resolution}${extension}`) + expect(file.resolution.id).to.equal(attributeFile.resolution) + expect(file.resolution.label).to.equal(attributeFile.resolution + 'p') 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) + { + await testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath) + } + + if (attributes.previewfile) { + await testImage(url, attributes.previewfile, videoDetails.previewPath) + } const torrent = await webtorrentAdd(magnetUri, true) expect(torrent.files).to.be.an('array') @@ -429,11 +493,12 @@ export { searchVideo, searchVideoWithPagination, searchVideoWithSort, - testVideoImage, uploadVideo, updateVideo, rateVideo, viewVideo, parseTorrentVideo, - completeVideoCheck + getLocalVideos, + completeVideoCheck, + checkVideoFilesWereRemoved }