X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-channels.ts;h=3493a723d41693a01e0b58f28a185eee31efaae5;hb=8eb07b01306429abe5c538ff7aa0a16e44fff26f;hp=4f600cae8eefb11ecd2be702734aeb26ca0810cb;hpb=7d14d4d2ca82cc43c93b45bb1f90af975cfbf67c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 4f600cae8..3493a723d 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -1,19 +1,20 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import * as chai from 'chai' import 'mocha' -import { User, Video, VideoChannel, VideoDetails } from '../../../../shared/index' +import * as chai from 'chai' import { cleanupTests, createUser, doubleFollow, - flushAndRunMultipleServers, getVideo, + flushAndRunMultipleServers, + getVideo, getVideoChannelVideos, testImage, updateVideo, updateVideoChannelAvatar, uploadVideo, - userLogin + userLogin, + wait } from '../../../../shared/extra-utils' import { addVideoChannel, @@ -24,9 +25,11 @@ import { getVideoChannelsList, ServerInfo, setAccessTokensToServers, - updateVideoChannel + updateVideoChannel, + viewVideo } from '../../../../shared/extra-utils/index' import { waitJobs } from '../../../../shared/extra-utils/server/jobs' +import { User, Video, VideoChannel, VideoDetails } from '../../../../shared/index' const expect = chai.expect @@ -73,14 +76,14 @@ describe('Test video channels', function () { description: 'super video channel description', support: 'super video channel support text' } - const res = await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel) + const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel) secondVideoChannelId = res.body.videoChannel.id } // The channel is 1 is propagated to servers 2 { const videoAttributesArg = { name: 'my video name', channelId: secondVideoChannelId, support: 'video support field' } - const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributesArg) + const res = await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributesArg) videoUUID = res.body.video.uuid } @@ -106,7 +109,7 @@ describe('Test video channels', function () { it('Should have two video channels when getting account channels on server 1', async function () { const res = await getAccountVideoChannelsList({ - url: servers[ 0 ].url, + url: servers[0].url, accountName: userInfo.account.name + '@' + userInfo.account.host }) @@ -127,7 +130,7 @@ describe('Test video channels', function () { it('Should paginate and sort account channels', async function () { { const res = await getAccountVideoChannelsList({ - url: servers[ 0 ].url, + url: servers[0].url, accountName: userInfo.account.name + '@' + userInfo.account.host, start: 0, count: 1, @@ -137,13 +140,13 @@ describe('Test video channels', function () { expect(res.body.total).to.equal(2) expect(res.body.data).to.have.lengthOf(1) - const videoChannel: VideoChannel = res.body.data[ 0 ] + const videoChannel: VideoChannel = res.body.data[0] expect(videoChannel.name).to.equal('root_channel') } { const res = await getAccountVideoChannelsList({ - url: servers[ 0 ].url, + url: servers[0].url, accountName: userInfo.account.name + '@' + userInfo.account.host, start: 0, count: 1, @@ -153,13 +156,13 @@ describe('Test video channels', function () { expect(res.body.total).to.equal(2) expect(res.body.data).to.have.lengthOf(1) - const videoChannel: VideoChannel = res.body.data[ 0 ] + const videoChannel: VideoChannel = res.body.data[0] expect(videoChannel.name).to.equal('second_video_channel') } { const res = await getAccountVideoChannelsList({ - url: servers[ 0 ].url, + url: servers[0].url, accountName: userInfo.account.name + '@' + userInfo.account.host, start: 1, count: 1, @@ -169,14 +172,14 @@ describe('Test video channels', function () { expect(res.body.total).to.equal(2) expect(res.body.data).to.have.lengthOf(1) - const videoChannel: VideoChannel = res.body.data[ 0 ] + const videoChannel: VideoChannel = res.body.data[0] expect(videoChannel.name).to.equal('root_channel') } }) it('Should have one video channel when getting account channels on server 2', async function () { const res = await getAccountVideoChannelsList({ - url: servers[ 1 ].url, + url: servers[1].url, accountName: userInfo.account.name + '@' + userInfo.account.host }) @@ -349,19 +352,75 @@ describe('Test video channels', function () { it('Should create the main channel with an uuid if there is a conflict', async function () { { const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' } - await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel) + await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel) } { - await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: 'toto', password: 'password' }) - const accessToken = await userLogin(servers[ 0 ], { username: 'toto', password: 'password' }) + await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: 'toto', password: 'password' }) + const accessToken = await userLogin(servers[0], { username: 'toto', password: 'password' }) - const res = await getMyUserInformation(servers[ 0 ].url, accessToken) - const videoChannel = res.body.videoChannels[ 0 ] + const res = await getMyUserInformation(servers[0].url, accessToken) + const videoChannel = res.body.videoChannels[0] expect(videoChannel.name).to.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/) } }) + it('Should report correct channel views per days', async function () { + this.timeout(10000) + + { + const res = await getAccountVideoChannelsList({ + url: servers[0].url, + accountName: userInfo.account.name + '@' + userInfo.account.host, + withStats: true + }) + + const channels: VideoChannel[] = res.body.data + + for (const channel of channels) { + expect(channel).to.haveOwnProperty('viewsPerDay') + expect(channel.viewsPerDay).to.have.length(30 + 1) // daysPrior + today + + for (const v of channel.viewsPerDay) { + expect(v.date).to.be.an('string') + expect(v.views).to.equal(0) + } + } + } + + { + // video has been posted on channel firstVideoChannelId since last update + await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.1,127.0.0.1') + await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.2,127.0.0.1') + + // Wait the repeatable job + await wait(8000) + + const res = await getAccountVideoChannelsList({ + url: servers[0].url, + accountName: userInfo.account.name + '@' + userInfo.account.host, + withStats: true + }) + const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === firstVideoChannelId) + expect(channelWithView.viewsPerDay.slice(-1)[0].views).to.equal(2) + } + }) + + it('Should report correct videos count', async function () { + const res = await getAccountVideoChannelsList({ + url: servers[0].url, + accountName: userInfo.account.name + '@' + userInfo.account.host, + withStats: true + }) + const channels: VideoChannel[] = res.body.data + + const totoChannel = channels.find(c => c.name === 'toto_channel') + const rootChannel = channels.find(c => c.name === 'root_channel') + + expect(rootChannel.videosCount).to.equal(1) + expect(totoChannel.videosCount).to.equal(0) + }) + after(async function () { await cleanupTests(servers) })