X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fvideos%2Fvideos.ts;h=df9071c292fa8957082f69910da24755a040907b;hb=0883b3245bf0deb9106c4041e9afbd3521b79280;hp=8e58f1f0c7f4ff1f3b7c15a16fd703e38386252b;hpb=1d791a26de648d798df4ee1c04113baf7f1f3b4c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 8e58f1f0c..df9071c29 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -85,13 +85,18 @@ function getVideo (url: string, id: number | string, expectedStatus = 200) { .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) { @@ -123,6 +128,29 @@ function getVideosList (url: string) { .expect('Content-Type', /json/) } +function getVideosListWithToken (url: string, token: string) { + const path = '/api/v1/videos' + + return request(url) + .get(path) + .set('Authorization', 'Bearer ' + token) + .query({ sort: 'name' }) + .set('Accept', 'application/json') + .expect(200) + .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' @@ -186,6 +214,18 @@ function searchVideo (url: string, search: string) { .expect('Content-Type', /json/) } +function searchVideoWithToken (url: string, search: string, token: string) { + const path = '/api/v1/videos' + const req = request(url) + .get(path + '/search') + .set('Authorization', 'Bearer ' + token) + .query({ search }) + .set('Accept', 'application/json') + + return req.expect(200) + .expect('Content-Type', /json/) +} + function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) { const path = '/api/v1/videos' @@ -248,6 +288,7 @@ 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, @@ -277,6 +318,10 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg req.field('licence', attributes.licence.toString()) } + for (let i = 0; i < attributes.tags.length; i++) { + req.field('tags[' + i + ']', attributes.tags[i]) + } + if (attributes.thumbnailfile !== undefined) { req.attach('thumbnailfile', buildAbsoluteFixturePath(attributes.thumbnailfile)) } @@ -284,10 +329,6 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg req.attach('previewfile', buildAbsoluteFixturePath(attributes.previewfile)) } - for (let i = 0; i < attributes.tags.length; i++) { - req.field('tags[' + i + ']', attributes.tags[i]) - } - return req.attach('videofile', buildAbsoluteFixturePath(attributes.fixture)) .expect(specialStatus) } @@ -366,8 +407,11 @@ async function completeVideoCheck ( nsfw: boolean commentsEnabled: boolean description: string - host: string - account: string + support: string + account: { + name: string + host: string + } isLocal: boolean, tags: string[], privacy: number, @@ -392,21 +436,22 @@ async function completeVideoCheck ( 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) 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 const res = await getVideo(url, video.uuid) @@ -414,9 +459,10 @@ async function completeVideoCheck ( 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.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) @@ -426,32 +472,30 @@ async function completeVideoCheck ( expect(dateIsValid(videoDetails.channel.updatedAt)).to.be.true for (const attributeFile of attributes.files) { - const file = videoDetails.files.find(f => f.resolution === attributeFile.resolution) + const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution) expect(file).not.to.be.undefined 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.id}.torrent`) + expect(file.fileUrl).to.equal(`http://${attributes.account.host}/static/webseed/${videoDetails.uuid}-${file.resolution.id}${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 testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath) - expect(test).to.equal(true) + await testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath) } if (attributes.previewfile) { - const test = await testImage(url, attributes.previewfile, videoDetails.previewPath) - expect(test).to.equal(true) + await testImage(url, attributes.previewfile, videoDetails.previewPath) } const torrent = await webtorrentAdd(magnetUri, true) @@ -470,6 +514,7 @@ export { getVideoPrivacies, getVideoLanguages, getMyVideos, + searchVideoWithToken, getVideo, getVideoWithToken, getVideosList, @@ -479,11 +524,13 @@ export { searchVideo, searchVideoWithPagination, searchVideoWithSort, + getVideosListWithToken, uploadVideo, updateVideo, rateVideo, viewVideo, parseTorrentVideo, + getLocalVideos, completeVideoCheck, checkVideoFilesWereRemoved }