ServerInfo,
testImage
} from '../'
-import * as validator from 'validator'
+import validator from 'validator'
import { VideoDetails, VideoPrivacy } from '../../models/videos'
import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, loadLanguages, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
-import { dateIsValid, webtorrentAdd } from '../miscs/miscs'
+import { dateIsValid, webtorrentAdd, buildServerDirectory } from '../miscs/miscs'
loadLanguages()
.expect('Content-Type', /json/)
}
-function getMyVideos (url: string, accessToken: string, start: number, count: number, sort?: string) {
+function getMyVideos (url: string, accessToken: string, start: number, count: number, sort?: string, search?: string) {
const path = '/api/v1/users/me/videos'
const req = request(url)
.get(path)
.query({ start: start })
.query({ count: count })
+ .query({ search: search })
if (sort) req.query({ sort })
})
}
-function getVideosListPagination (url: string, start: number, count: number, sort?: string) {
+function getVideosListPagination (url: string, start: number, count: number, sort?: string, skipCount?: boolean) {
const path = '/api/v1/videos'
const req = request(url)
.query({ count: count })
if (sort) req.query({ sort })
+ if (skipCount) req.query({ skipCount })
return req.set('Accept', 'application/json')
.expect(200)
join('redundancy', 'hls')
]
) {
- const testDirectory = 'test' + serverNumber
-
for (const directory of directories) {
- const directoryPath = join(root(), testDirectory, directory)
+ const directoryPath = buildServerDirectory(serverNumber, directory)
const directoryExists = await pathExists(directoryPath)
if (directoryExists === false) continue
// Transcoding enabled: extension will always be .mp4
if (attributes.files.length > 1) extension = '.mp4'
- const magnetUri = file.magnetUri
expect(file.magnetUri).to.have.lengthOf.above(2)
expect(file.torrentUrl).to.equal(`http://${attributes.account.host}/static/torrents/${videoDetails.uuid}-${file.resolution.id}.torrent`)
expect(file.fileUrl).to.equal(`http://${attributes.account.host}/static/webseed/${videoDetails.uuid}-${file.resolution.id}${extension}`)
'File size for resolution ' + file.resolution.label + ' outside confidence interval (' + minSize + '> size <' + maxSize + ')')
.to.be.above(minSize).and.below(maxSize)
- {
- 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)
+ const torrent = await webtorrentAdd(file.magnetUri, true)
expect(torrent.files).to.be.an('array')
expect(torrent.files.length).to.equal(1)
expect(torrent.files[0].path).to.exist.and.to.not.equal('')
}
+
+ await testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath)
+
+ if (attributes.previewfile) {
+ await testImage(url, attributes.previewfile, videoDetails.previewPath)
+ }
}
async function videoUUIDToId (url: string, id: number | string) {