X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fvideos%2Fvideos.ts;h=9105b5f13650be2492c6989b636f2d929ffc337e;hb=e883399fa6caa56bb8519c9a2e22d88001f26661;hp=605acf5657c6a59f7d33a30d32bf259edd4c342d;hpb=9ee83eb99e908c6038cbb6501bacfe18d092f0b6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 605acf565..9105b5f13 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -7,7 +7,7 @@ import { extname, isAbsolute, join } from 'path' import * as request from 'supertest' import { getMyUserInformation, makeGetRequest, root, ServerInfo, testImage } from '../' import { VideoPrivacy } from '../../../../shared/models/videos' -import { readdirPromise, readFileBufferPromise } from '../../../helpers/core-utils' +import { readdirPromise } from '../../../helpers/core-utils' import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers' import { dateIsValid, webtorrentAdd } from '../index' @@ -249,17 +249,23 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .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('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) - .field('description', attributes.description) .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]) @@ -373,7 +379,7 @@ 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)