X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Ftests%2Fapi%2Fvideos%2Fsingle-server.ts;h=d8af94e8f9302fe98bf6442b9af2edad511c3073;hb=3cd0734fd9b0ff21aaef02317a874e8f1c06e027;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..d8af94e8f 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -3,10 +3,10 @@ import * as chai from 'chai' import { keyBy } from 'lodash' import 'mocha' -import { join } from 'path' import { VideoPrivacy } from '../../../../shared/models/videos' import { - dateIsValid, + checkVideoFilesWereRemoved, + completeVideoCheck, flushTests, getVideo, getVideoCategories, @@ -18,7 +18,6 @@ import { getVideosListSort, killallServers, rateVideo, - readdirPromise, removeVideo, runServer, searchVideo, @@ -26,12 +25,11 @@ import { searchVideoWithSort, ServerInfo, setAccessTokensToServers, - testVideoImage, + testImage, updateVideo, uploadVideo, - wait, - webtorrentAdd, - viewVideo, completeVideoCheck, immutableAssign + viewVideo, + wait } from '../../utils' const expect = chai.expect @@ -46,15 +44,19 @@ describe('Test a single server', function () { 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:9001' + }, isLocal: true, duration: 5, tags: [ 'tag1', 'tag2', 'tag3' ], privacy: VideoPrivacy.PUBLIC, + commentsEnabled: true, channel: { name: 'Default root channel', description: '', @@ -73,15 +75,19 @@ describe('Test a single server', function () { 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:9001' + }, isLocal: true, tags: [ 'tagup1', 'tagup2' ], privacy: VideoPrivacy.PUBLIC, duration: 5, + commentsEnabled: false, channel: { name: 'Default root channel', description: '', @@ -97,7 +103,7 @@ describe('Test a single server', function () { } before(async function () { - this.timeout(10000) + this.timeout(30000) await flushTests() @@ -130,7 +136,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 +174,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) @@ -182,8 +187,7 @@ describe('Test a single server', function () { }) 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) @@ -192,7 +196,19 @@ describe('Test a single server', function () { }) it('Should have the views updated', async function () { + this.timeout(10000) + + await viewVideo(server.url, videoId) + await viewVideo(server.url, videoId) + await viewVideo(server.url, videoId) + + await wait(1500) + + await viewVideo(server.url, videoId) await viewVideo(server.url, videoId) + + await wait(1500) + await viewVideo(server.url, videoId) await viewVideo(server.url, videoId) @@ -213,32 +229,6 @@ describe('Test a single server', function () { await completeVideoCheck(server.url, video, getCheckAttributes) }) - // 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') @@ -253,12 +243,12 @@ describe('Test a single server', function () { // 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.language).to.equal('zh') + // expect(video.languageLabel).to.equal('Chinese') // 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.account.name).to.equal('root') + // expect(video.account.host).to.equal('localhost:9001') // expect(video.isLocal).to.be.true // expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ]) // expect(dateIsValid(video.createdAt)).to.be.true @@ -297,11 +287,7 @@ describe('Test a single server', function () { 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 +313,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 +352,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) } }) @@ -495,9 +479,10 @@ 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, tags: [ 'tagup1', 'tagup2' ] } await updateVideo(server.url, server.accessToken, videoId, attributes)