X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fsingle-server.ts;h=596fff9965fb045a969392d33bd5b707e4422f00;hb=134cf2bce96a8c5aefd55154e884964975d8cf23;hp=934c653b19dd0bfe992781fbbe70aa5a36668316;hpb=b1f5b93e4f1a9ae9015463c9a4946722ed87ec2e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index 934c653b1..596fff996 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -1,13 +1,14 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import * as chai from 'chai' import { keyBy } from 'lodash' import 'mocha' -import { join } from 'path' import { VideoPrivacy } from '../../../../shared/models/videos' import { - dateIsValid, - flushTests, + checkVideoFilesWereRemoved, + cleanupTests, + completeVideoCheck, + flushAndRunServer, getVideo, getVideoCategories, getVideoLanguages, @@ -16,23 +17,17 @@ import { getVideosList, getVideosListPagination, getVideosListSort, - killallServers, + getVideosWithFilters, rateVideo, - readdirPromise, removeVideo, - runServer, - searchVideo, - searchVideoWithPagination, - searchVideoWithSort, ServerInfo, setAccessTokensToServers, - testVideoImage, + testImage, updateVideo, uploadVideo, - wait, - webtorrentAdd, - viewVideo, completeVideoCheck, immutableAssign -} from '../../utils' + viewVideo, + wait +} from '../../../../shared/extra-utils' const expect = chai.expect @@ -42,21 +37,27 @@ describe('Test a single server', function () { let videoUUID = '' let videosListBase: any[] = null - const getCheckAttributes = { + const getCheckAttributes = () => ({ name: 'my super name', category: 2, licence: 6, - language: 3, + language: 'zh', nsfw: true, description: 'my super description', - host: 'localhost:9001', - account: 'root', + support: 'my super support text', + account: { + name: 'root', + host: 'localhost:' + server.port + }, isLocal: true, duration: 5, tags: [ 'tag1', 'tag2', 'tag3' ], privacy: VideoPrivacy.PUBLIC, + commentsEnabled: true, + downloadEnabled: true, channel: { - name: 'Default root channel', + displayName: 'Main root channel', + name: 'root_channel', description: '', isLocal: true }, @@ -67,23 +68,29 @@ describe('Test a single server', function () { size: 218910 } ] - } + }) - const updateCheckAttributes = { + const updateCheckAttributes = () => ({ name: 'my super video updated', category: 4, licence: 2, - language: 5, - nsfw: true, + language: 'ar', + nsfw: false, description: 'my super description updated', - host: 'localhost:9001', - account: 'root', + support: 'my super support text updated', + account: { + name: 'root', + host: 'localhost:' + server.port + }, isLocal: true, tags: [ 'tagup1', 'tagup2' ], privacy: VideoPrivacy.PUBLIC, duration: 5, + commentsEnabled: false, + downloadEnabled: false, channel: { - name: 'Default root channel', + name: 'root_channel', + displayName: 'Main root channel', description: '', isLocal: true }, @@ -94,14 +101,12 @@ describe('Test a single server', function () { size: 292677 } ] - } + }) before(async function () { - this.timeout(10000) - - await flushTests() + this.timeout(30000) - server = await runServer(1) + server = await flushAndRunServer(1) await setAccessTokensToServers([ server ]) }) @@ -112,7 +117,7 @@ describe('Test a single server', function () { const categories = res.body expect(Object.keys(categories)).to.have.length.above(10) - expect(categories[11]).to.equal('News') + expect(categories[11]).to.equal('News & Politics') }) it('Should list video licences', async function () { @@ -130,7 +135,7 @@ describe('Test a single server', function () { const languages = res.body expect(Object.keys(languages)).to.have.length.above(5) - expect(languages[3]).to.equal('Mandarin') + expect(languages['ru']).to.equal('Russian') }) it('Should list video privacies', async function () { @@ -168,8 +173,7 @@ describe('Test a single server', function () { }) it('Should get and seed the uploaded video', async function () { - // Yes, this could be long - this.timeout(60000) + this.timeout(5000) const res = await getVideosList(server.url) @@ -178,130 +182,48 @@ describe('Test a single server', function () { expect(res.body.data.length).to.equal(1) const video = res.body.data[0] - await completeVideoCheck(server.url, video, getCheckAttributes) + await completeVideoCheck(server.url, video, getCheckAttributes()) }) it('Should get the video by UUID', async function () { - // Yes, this could be long - this.timeout(60000) + this.timeout(5000) const res = await getVideo(server.url, videoUUID) const video = res.body - await completeVideoCheck(server.url, video, getCheckAttributes) + await completeVideoCheck(server.url, video, getCheckAttributes()) }) it('Should have the views updated', async function () { + this.timeout(20000) + await viewVideo(server.url, videoId) await viewVideo(server.url, videoId) await viewVideo(server.url, videoId) - const res = await getVideo(server.url, videoId) + await wait(1500) - const video = res.body - expect(video.views).to.equal(3) - }) + await viewVideo(server.url, videoId) + await viewVideo(server.url, videoId) - it('Should search the video by name', async function () { - const res = await searchVideo(server.url, 'my') + await wait(1500) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(1) + await viewVideo(server.url, videoId) + await viewVideo(server.url, videoId) - const video = res.body.data[0] - await completeVideoCheck(server.url, video, getCheckAttributes) - }) + // Wait the repeatable job + await wait(8000) - // Not implemented yet - // it('Should search the video by serverHost', async function () { - // const res = await videosUtils.searchVideo(server.url, '9001', 'host') - - // expect(res.body.total).to.equal(1) - // expect(res.body.data).to.be.an('array') - // expect(res.body.data.length).to.equal(1) - - // const video = res.body.data[0] - // expect(video.name).to.equal('my super name') - // expect(video.description).to.equal('my super description') - // expect(video.serverHost).to.equal('localhost:9001') - // expect(video.author).to.equal('root') - // expect(video.isLocal).to.be.true - // expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ]) - // expect(dateIsValid(video.createdAt)).to.be.true - // expect(dateIsValid(video.updatedAt)).to.be.true - - // const test = await testVideoImage(server.url, 'video_short.webm', video.thumbnailPath) - // expect(test).to.equal(true) - - // done() - // }) - // }) - // }) - - // Not implemented yet - // it('Should search the video by tag', async function () { - // const res = await searchVideo(server.url, 'tag1') - // - // expect(res.body.total).to.equal(1) - // expect(res.body.data).to.be.an('array') - // expect(res.body.data.length).to.equal(1) - // - // const video = res.body.data[0] - // expect(video.name).to.equal('my super name') - // expect(video.category).to.equal(2) - // expect(video.categoryLabel).to.equal('Films') - // expect(video.licence).to.equal(6) - // expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives') - // expect(video.language).to.equal(3) - // expect(video.languageLabel).to.equal('Mandarin') - // expect(video.nsfw).to.be.ok - // expect(video.description).to.equal('my super description') - // expect(video.serverHost).to.equal('localhost:9001') - // expect(video.accountName).to.equal('root') - // expect(video.isLocal).to.be.true - // expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ]) - // expect(dateIsValid(video.createdAt)).to.be.true - // expect(dateIsValid(video.updatedAt)).to.be.true - // - // const test = await testVideoImage(server.url, 'video_short.webm', video.thumbnailPath) - // expect(test).to.equal(true) - // }) - - it('Should not find a search by name', async function () { - const res = await searchVideo(server.url, 'hello') + const res = await getVideo(server.url, videoId) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) + const video = res.body + expect(video.views).to.equal(3) }) - // Not implemented yet - // it('Should not find a search by author', async function () { - // const res = await searchVideo(server.url, 'hello') - // - // expect(res.body.total).to.equal(0) - // expect(res.body.data).to.be.an('array') - // expect(res.body.data.length).to.equal(0) - // }) - // - // Not implemented yet - // it('Should not find a search by tag', async function () { - // const res = await searchVideo(server.url, 'hello') - // - // expect(res.body.total).to.equal(0) - // expect(res.body.data).to.be.an('array') - // expect(res.body.data.length).to.equal(0) - // }) - it('Should remove the video', async function () { await removeVideo(server.url, server.accessToken, videoId) - const files1 = await readdirPromise(join(__dirname, '..', '..', '..', '..', 'test1', 'videos')) - expect(files1).to.have.lengthOf(0) - - const files2 = await readdirPromise(join(__dirname, '..', '..', '..', '..', 'test1', 'thumbnails')) - expect(files2).to.have.lengthOf(0) + await checkVideoFilesWereRemoved(videoUUID, 1) }) it('Should not have videos', async function () { @@ -327,7 +249,7 @@ describe('Test a single server', function () { description: video + ' description', category: 2, licence: 1, - language: 1, + language: 'en', nsfw: true, tags: [ 'tag1', 'tag2', 'tag3' ], fixture: video @@ -366,9 +288,7 @@ describe('Test a single server', function () { for (const video of videos) { const videoName = video.name.replace(' name', '') - const test = await testVideoImage(server.url, videoName, video.thumbnailPath) - - expect(test).to.equal(true) + await testImage(server.url, videoName, video.thumbnailPath) } }) @@ -402,65 +322,15 @@ describe('Test a single server', function () { expect(videos[0].name).to.equal(videosListBase[5].name) }) - it('Should search the first video', async function () { - const res = await searchVideoWithPagination(server.url, 'webm', 0, 1, 'name') + it('Should not have the total field', async function () { + const res = await getVideosListPagination(server.url, 5, 6, 'name', true) const videos = res.body.data - expect(res.body.total).to.equal(4) + expect(res.body.total).to.not.exist expect(videos.length).to.equal(1) - expect(videos[0].name).to.equal('video_short1.webm name') - }) - - it('Should search the last two videos', async function () { - const res = await searchVideoWithPagination(server.url, 'webm', 2, 2, 'name') - - const videos = res.body.data - expect(res.body.total).to.equal(4) - expect(videos.length).to.equal(2) - expect(videos[0].name).to.equal('video_short3.webm name') - expect(videos[1].name).to.equal('video_short.webm name') - }) - - it('Should search all the webm videos', async function () { - const res = await searchVideoWithPagination(server.url, 'webm', 0, 15) - - const videos = res.body.data - expect(res.body.total).to.equal(4) - expect(videos.length).to.equal(4) + expect(videos[0].name).to.equal(videosListBase[5].name) }) - // Not implemented yet - // it('Should search all the root author videos', async function () { - // const res = await searchVideoWithPagination(server.url, 'root', 0, 15) - // - // const videos = res.body.data - // expect(res.body.total).to.equal(6) - // expect(videos.length).to.equal(6) - // }) - - // Not implemented yet - // it('Should search all the 9001 port videos', async function () { - // const res = await videosUtils.searchVideoWithPagination(server.url, '9001', 'host', 0, 15) - - // const videos = res.body.data - // expect(res.body.total).to.equal(6) - // expect(videos.length).to.equal(6) - - // done() - // }) - // }) - - // it('Should search all the localhost videos', async function () { - // const res = await videosUtils.searchVideoWithPagination(server.url, 'localhost', 'host', 0, 15) - - // const videos = res.body.data - // expect(res.body.total).to.equal(6) - // expect(videos.length).to.equal(6) - - // done() - // }) - // }) - it('Should list and sort by name in descending order', async function () { const res = await getVideosListSort(server.url, '-name') @@ -473,21 +343,16 @@ describe('Test a single server', function () { expect(videos[3].name).to.equal('video_short3.webm name') expect(videos[4].name).to.equal('video_short2.webm name') expect(videos[5].name).to.equal('video_short1.webm name') + + videoId = videos[3].uuid }) - it('Should search and sort by name in ascending order', async function () { - const res = await searchVideoWithSort(server.url, 'webm', 'name') + it('Should list and sort by trending in descending order', async function () { + const res = await getVideosListPagination(server.url, 0, 2, '-trending') const videos = res.body.data - expect(res.body.total).to.equal(4) - expect(videos.length).to.equal(4) - - expect(videos[0].name).to.equal('video_short1.webm name') - expect(videos[1].name).to.equal('video_short2.webm name') - expect(videos[2].name).to.equal('video_short3.webm name') - expect(videos[3].name).to.equal('video_short.webm name') - - videoId = videos[2].id + expect(res.body.total).to.equal(6) + expect(videos.length).to.equal(2) }) it('Should update a video', async function () { @@ -495,21 +360,32 @@ describe('Test a single server', function () { name: 'my super video updated', category: 4, licence: 2, - language: 5, + language: 'ar', nsfw: false, description: 'my super description updated', + commentsEnabled: false, + downloadEnabled: false, tags: [ 'tagup1', 'tagup2' ] } await updateVideo(server.url, server.accessToken, videoId, attributes) }) + it('Should filter by tags and category', async function () { + const res1 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: 4 }) + expect(res1.body.total).to.equal(1) + expect(res1.body.data[0].name).to.equal('my super video updated') + + const res2 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: 3 }) + expect(res2.body.total).to.equal(0) + }) + it('Should have the video updated', async function () { this.timeout(60000) const res = await getVideo(server.url, videoId) const video = res.body - await completeVideoCheck(server.url, video, updateCheckAttributes) + await completeVideoCheck(server.url, video, updateCheckAttributes()) }) it('Should update only the tags of a video', async function () { @@ -521,7 +397,7 @@ describe('Test a single server', function () { const res = await getVideo(server.url, videoId) const video = res.body - await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes, attributes)) + await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes(), attributes)) }) it('Should update only the description of a video', async function () { @@ -533,7 +409,8 @@ describe('Test a single server', function () { const res = await getVideo(server.url, videoId) const video = res.body - await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes, attributes)) + const expectedAttributes = Object.assign(updateCheckAttributes(), { tags: [ 'supertag', 'tag1', 'tag2' ] }, attributes) + await completeVideoCheck(server.url, video, expectedAttributes) }) it('Should like a video', async function () { @@ -557,11 +434,6 @@ describe('Test a single server', function () { }) after(async function () { - killallServers([ server ]) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests([ server ]) }) })