import { expect } from 'chai'
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, root, ServerInfo } from '../'
+import {
+ buildAbsoluteFixturePath,
+ getMyUserInformation,
+ makeGetRequest,
+ makePutBodyRequest,
+ makeUploadRequest,
+ 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'
channelId?: number
privacy?: VideoPrivacy
fixture?: string
+ thumbnailfile?: string
+ previewfile?: string
}
function getVideoCategories (url: string) {
}
}
-async function testImage (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']) {
- const res = await request(url)
- .get(imagePath)
- .expect(200)
-
- const data = await readFileBufferPromise(join(__dirname, '..', '..', 'api', 'fixtures', imageName + extension))
-
- return data.equals(res.body)
- } else {
- console.log('Do not test images. Enable it by setting NODE_TEST_IMAGE env variable.')
- return true
- }
-}
-
async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 200) {
const path = '/api/v1/videos/upload'
let defaultChannelId = '1'
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,
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('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])
}
- 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 | string, 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 = {}
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) {
nsfw: boolean
commentsEnabled: boolean
description: string
- host: string
- account: string
+ support: string
+ account: {
+ name: string
+ host: string
+ }
isLocal: boolean,
tags: string[],
privacy: number,
files: {
resolution: number
size: number
- }[]
+ }[],
+ thumbnailfile?: string
+ previewfile?: string
}
) {
if (!attributes.likes) attributes.likes = 0
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.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)
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.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)
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.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).to.equal(attributeFile.resolution)
expect(file.resolutionLabel).to.equal(attributeFile.resolution + 'p')
const maxSize = attributeFile.size + ((10 * attributeFile.size) / 100)
expect(file.size).to.be.above(minSize).and.below(maxSize)
- const test = await testImage(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')
searchVideo,
searchVideoWithPagination,
searchVideoWithSort,
- testImage,
uploadVideo,
updateVideo,
rateVideo,
projects / github / Chocobozzz / PeerTube.git / blobdiff