X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fsingle-server.ts;h=596fff9965fb045a969392d33bd5b707e4422f00;hb=134cf2bce96a8c5aefd55154e884964975d8cf23;hp=a757ad9da809fb19b913072b05e5941b0c9633d3;hpb=f6eebcb336c067e160a62020a5140d8d992ba384;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index a757ad9da..596fff996 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -1,4 +1,4 @@ -/* 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' @@ -6,8 +6,9 @@ import 'mocha' import { VideoPrivacy } from '../../../../shared/models/videos' import { checkVideoFilesWereRemoved, + cleanupTests, completeVideoCheck, - flushTests, + flushAndRunServer, getVideo, getVideoCategories, getVideoLanguages, @@ -17,10 +18,8 @@ import { getVideosListPagination, getVideosListSort, getVideosWithFilters, - killallServers, rateVideo, removeVideo, - runServer, ServerInfo, setAccessTokensToServers, testImage, @@ -28,7 +27,7 @@ import { uploadVideo, viewVideo, wait -} from '../../utils' +} from '../../../../shared/extra-utils' const expect = chai.expect @@ -38,7 +37,7 @@ describe('Test a single server', function () { let videoUUID = '' let videosListBase: any[] = null - const getCheckAttributes = { + const getCheckAttributes = () => ({ name: 'my super name', category: 2, licence: 6, @@ -48,13 +47,14 @@ describe('Test a single server', function () { support: 'my super support text', account: { name: 'root', - host: 'localhost:9001' + host: 'localhost:' + server.port }, isLocal: true, duration: 5, tags: [ 'tag1', 'tag2', 'tag3' ], privacy: VideoPrivacy.PUBLIC, commentsEnabled: true, + downloadEnabled: true, channel: { displayName: 'Main root channel', name: 'root_channel', @@ -68,9 +68,9 @@ describe('Test a single server', function () { size: 218910 } ] - } + }) - const updateCheckAttributes = { + const updateCheckAttributes = () => ({ name: 'my super video updated', category: 4, licence: 2, @@ -80,13 +80,14 @@ describe('Test a single server', function () { support: 'my super support text updated', account: { name: 'root', - host: 'localhost:9001' + host: 'localhost:' + server.port }, isLocal: true, tags: [ 'tagup1', 'tagup2' ], privacy: VideoPrivacy.PUBLIC, duration: 5, commentsEnabled: false, + downloadEnabled: false, channel: { name: 'root_channel', displayName: 'Main root channel', @@ -100,14 +101,12 @@ describe('Test a single server', function () { size: 292677 } ] - } + }) before(async function () { this.timeout(30000) - await flushTests() - - server = await runServer(1) + server = await flushAndRunServer(1) await setAccessTokensToServers([ server ]) }) @@ -118,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 () { @@ -183,7 +182,7 @@ 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 () { @@ -192,11 +191,11 @@ describe('Test a single server', function () { 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(10000) + this.timeout(20000) await viewVideo(server.url, videoId) await viewVideo(server.url, videoId) @@ -212,6 +211,9 @@ describe('Test a single server', function () { await viewVideo(server.url, videoId) await viewVideo(server.url, videoId) + // Wait the repeatable job + await wait(8000) + const res = await getVideo(server.url, videoId) const video = res.body @@ -320,6 +322,15 @@ describe('Test a single server', function () { expect(videos[0].name).to.equal(videosListBase[5].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.not.exist + expect(videos.length).to.equal(1) + expect(videos[0].name).to.equal(videosListBase[5].name) + }) + it('Should list and sort by name in descending order', async function () { const res = await getVideosListSort(server.url, '-name') @@ -336,6 +347,14 @@ describe('Test a single server', function () { videoId = videos[3].uuid }) + 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(6) + expect(videos.length).to.equal(2) + }) + it('Should update a video', async function () { const attributes = { name: 'my super video updated', @@ -345,6 +364,7 @@ describe('Test a single server', function () { nsfw: false, description: 'my super description updated', commentsEnabled: false, + downloadEnabled: false, tags: [ 'tagup1', 'tagup2' ] } await updateVideo(server.url, server.accessToken, videoId, attributes) @@ -365,7 +385,7 @@ describe('Test a single server', function () { 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 () { @@ -377,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 () { @@ -389,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 () { @@ -413,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 ]) }) })