import * as request from 'supertest'
import {
buildAbsoluteFixturePath,
- getMyUserInformation,
+ getMyUserInformation, immutableAssign,
makeGetRequest,
makePutBodyRequest,
makeUploadRequest,
ServerInfo,
testImage
} from '../'
-import { VideoPrivacy } from '../../../../shared/models/videos'
+import { VideoDetails, 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'
name?: string
category?: number
licence?: number
- language?: number
+ language?: string
nsfw?: boolean
commentsEnabled?: boolean
+ waitTranscoding?: boolean
description?: string
tags?: string[]
channelId?: number
fixture?: string
thumbnailfile?: string
previewfile?: string
+ scheduleUpdate?: {
+ updateAt: string
+ privacy?: VideoPrivacy
+ }
}
function getVideoCategories (url: string) {
.expect(expectedStatus)
}
-function viewVideo (url: string, id: number | string, expectedStatus = 204) {
+function viewVideo (url: string, id: number | string, expectedStatus = 204, xForwardedFor?: string) {
const path = '/api/v1/videos/' + id + '/views'
- return request(url)
+ const req = request(url)
.post(path)
.set('Accept', 'application/json')
- .expect(expectedStatus)
+
+ if (xForwardedFor) {
+ req.set('X-Forwarded-For', xForwardedFor)
+ }
+
+ return req.expect(expectedStatus)
}
function getVideoWithToken (url: string, token: string, id: number | string, expectedStatus = 200) {
.expect('Content-Type', /json/)
}
+function getVideosListWithToken (url: string, token: string, query: { nsfw?: boolean } = {}) {
+ const path = '/api/v1/videos'
+
+ return request(url)
+ .get(path)
+ .set('Authorization', 'Bearer ' + token)
+ .query(immutableAssign(query, { sort: 'name' }))
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+}
+
function getLocalVideos (url: string) {
const path = '/api/v1/videos'
.expect('Content-Type', /json/)
}
+function getAccountVideos (
+ url: string,
+ accessToken: string,
+ accountName: string,
+ start: number,
+ count: number,
+ sort?: string,
+ query: { nsfw?: boolean } = {}
+) {
+ const path = '/api/v1/accounts/' + accountName + '/videos'
+
+ return makeGetRequest({
+ url,
+ path,
+ query: immutableAssign(query, {
+ start,
+ count,
+ sort
+ }),
+ token: accessToken,
+ statusCodeExpected: 200
+ })
+}
+
+function getVideoChannelVideos (
+ url: string,
+ accessToken: string,
+ videoChannelId: number | string,
+ start: number,
+ count: number,
+ sort?: string,
+ query: { nsfw?: boolean } = {}
+) {
+ const path = '/api/v1/video-channels/' + videoChannelId + '/videos'
+
+ return makeGetRequest({
+ url,
+ path,
+ query: immutableAssign(query, {
+ start,
+ count,
+ sort
+ }),
+ token: accessToken,
+ statusCodeExpected: 200
+ })
+}
+
function getVideosListPagination (url: string, start: number, count: number, sort?: string) {
const path = '/api/v1/videos'
.expect('Content-Type', /json/)
}
-function removeVideo (url: string, token: string, id: number | string, expectedStatus = 204) {
+function getVideosWithFilters (url: string, query: { tagsAllOf: string[], categoryOneOf: number[] | number }) {
const path = '/api/v1/videos'
return request(url)
- .delete(path + '/' + id)
- .set('Accept', 'application/json')
- .set('Authorization', 'Bearer ' + token)
- .expect(expectedStatus)
-}
-
-function searchVideo (url: string, search: string) {
- const path = '/api/v1/videos'
- const req = request(url)
- .get(path + '/search')
- .query({ search })
+ .get(path)
+ .query(query)
.set('Accept', 'application/json')
-
- return req.expect(200)
+ .expect(200)
.expect('Content-Type', /json/)
}
-function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) {
- const path = '/api/v1/videos'
-
- const req = request(url)
- .get(path + '/search')
- .query({ start })
- .query({ search })
- .query({ count })
-
- if (sort) req.query({ sort })
-
- return req.set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
-}
-
-function searchVideoWithSort (url: string, search: string, sort: string) {
+function removeVideo (url: string, token: string, id: number | string, expectedStatus = 204) {
const path = '/api/v1/videos'
return request(url)
- .get(path + '/search')
- .query({ search })
- .query({ sort })
+ .delete(path + '/' + id)
.set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
+ .set('Authorization', 'Bearer ' + token)
+ .expect(expectedStatus)
}
async function checkVideoFilesWereRemoved (videoUUID: string, serverNumber: number) {
const testDirectory = 'test' + serverNumber
- for (const directory of [ 'videos', 'thumbnails', 'torrents', 'previews' ]) {
+ for (const directory of [ 'videos', 'thumbnails', 'torrents', 'previews', 'captions' ]) {
const directoryPath = join(root(), testDirectory, directory)
const directoryExists = existsSync(directoryPath)
name: 'my super video',
category: 5,
licence: 4,
- language: 3,
+ language: 'zh',
channelId: defaultChannelId,
nsfw: true,
+ waitTranscoding: false,
description: 'my super description',
support: 'my super support text',
tags: [ 'tag' ],
.field('name', attributes.name)
.field('nsfw', JSON.stringify(attributes.nsfw))
.field('commentsEnabled', JSON.stringify(attributes.commentsEnabled))
+ .field('waitTranscoding', JSON.stringify(attributes.waitTranscoding))
.field('privacy', attributes.privacy.toString())
.field('channelId', attributes.channelId)
req.attach('previewfile', buildAbsoluteFixturePath(attributes.previewfile))
}
+ if (attributes.scheduleUpdate) {
+ req.field('scheduleUpdate[updateAt]', attributes.scheduleUpdate.updateAt)
+
+ if (attributes.scheduleUpdate.privacy) {
+ req.field('scheduleUpdate[privacy]', attributes.scheduleUpdate.privacy)
+ }
+ }
+
return req.attach('videofile', buildAbsoluteFixturePath(attributes.fixture))
.expect(specialStatus)
}
if (attributes.description) body['description'] = attributes.description
if (attributes.tags) body['tags'] = attributes.tags
if (attributes.privacy) body['privacy'] = attributes.privacy
+ if (attributes.channelId) body['channelId'] = attributes.channelId
+ if (attributes.scheduleUpdate) body['scheduleUpdate'] = attributes.scheduleUpdate
// Upload request
if (attributes.thumbnailfile || attributes.previewfile) {
name: string
category: number
licence: number
- language: number
+ language: string
nsfw: boolean
commentsEnabled: boolean
description: string
+ publishedAt?: string
support: string
account: {
name: string
expect(video.name).to.equal(attributes.name)
expect(video.category.id).to.equal(attributes.category)
- expect(video.category.label).to.equal(VIDEO_CATEGORIES[attributes.category] || 'Misc')
+ expect(video.category.label).to.equal(attributes.category !== null ? 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.licence.label).to.equal(attributes.licence !== null ? 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.language.label).to.equal(attributes.language !== null ? VIDEO_LANGUAGES[attributes.language] : 'Unknown')
+ expect(video.privacy.id).to.deep.equal(attributes.privacy)
+ expect(video.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy])
expect(video.nsfw).to.equal(attributes.nsfw)
expect(video.description).to.equal(attributes.description)
+ expect(video.account.id).to.be.a('number')
+ expect(video.account.uuid).to.be.a('string')
expect(video.account.host).to.equal(attributes.account.host)
expect(video.account.name).to.equal(attributes.account.name)
+ expect(video.channel.displayName).to.equal(attributes.channel.name)
+ expect(video.channel.name).to.have.lengthOf(36)
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.publishedAt)).to.be.true
expect(dateIsValid(video.updatedAt)).to.be.true
+ if (attributes.publishedAt) {
+ expect(video.publishedAt).to.equal(attributes.publishedAt)
+ }
+
const res = await getVideo(url, video.uuid)
- const videoDetails = res.body
+ const videoDetails: VideoDetails = res.body
expect(videoDetails.files).to.have.lengthOf(attributes.files.length)
expect(videoDetails.tags).to.deep.equal(attributes.tags)
- 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.host).to.equal(attributes.account.host)
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
+ expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true
+ expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true
+ expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled)
for (const attributeFile of attributes.files) {
const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution)
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)
+ expect(file.size,
+ 'File size for resolution ' + file.resolution.label + ' outside confidence interval.')
+ .to.be.above(minSize).and.below(maxSize)
{
await testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath)
getVideoPrivacies,
getVideoLanguages,
getMyVideos,
+ getAccountVideos,
+ getVideoChannelVideos,
getVideo,
getVideoWithToken,
getVideosList,
getVideosListPagination,
getVideosListSort,
removeVideo,
- searchVideo,
- searchVideoWithPagination,
- searchVideoWithSort,
+ getVideosListWithToken,
uploadVideo,
+ getVideosWithFilters,
updateVideo,
rateVideo,
viewVideo,
projects / github / Chocobozzz / PeerTube.git / blobdiff