X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-channels.ts;h=7e7ad028cc72c5ba53a0a47badff07e049f90b8d;hb=e024fd6a7494b37251da1d59470324305cdb4129;hp=8033b9ba52bcccd35eb9f9efc1e4dd3412975fe2;hpb=213e30ef90806369529684ac9c247d73b8dc7928;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 8033b9ba5..7e7ad028c 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -2,14 +2,19 @@ import 'mocha' import * as chai from 'chai' +import { basename } from 'path' +import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants' import { cleanupTests, createUser, deleteVideoChannelImage, doubleFollow, flushAndRunMultipleServers, + getActorImage, getVideo, + getVideoChannel, getVideoChannelVideos, + setDefaultVideoChannel, testImage, updateVideo, updateVideoChannelImage, @@ -43,9 +48,10 @@ async function findChannel (server: ServerInfo, channelId: number) { describe('Test video channels', function () { let servers: ServerInfo[] let userInfo: User - let firstVideoChannelId: number let secondVideoChannelId: number + let totoChannel: number let videoUUID: string + let accountName: string before(async function () { this.timeout(60000) @@ -53,16 +59,9 @@ describe('Test video channels', function () { servers = await flushAndRunMultipleServers(2) await setAccessTokensToServers(servers) - await doubleFollow(servers[0], servers[1]) - - { - const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) - const user: User = res.body - - firstVideoChannelId = user.videoChannels[0].id - } + await setDefaultVideoChannel(servers) - await waitJobs(servers) + await doubleFollow(servers[0], servers[1]) }) it('Should have one video channel (created with root)', async () => { @@ -112,12 +111,14 @@ describe('Test video channels', function () { expect(videoChannels[1].displayName).to.equal('second video channel') expect(videoChannels[1].description).to.equal('super video channel description') expect(videoChannels[1].support).to.equal('super video channel support text') + + accountName = userInfo.account.name + '@' + userInfo.account.host }) it('Should have two video channels when getting account channels on server 1', async function () { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host + accountName }) expect(res.body.total).to.equal(2) @@ -138,7 +139,7 @@ describe('Test video channels', function () { { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, start: 0, count: 1, sort: 'createdAt' @@ -154,7 +155,7 @@ describe('Test video channels', function () { { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, start: 0, count: 1, sort: '-createdAt' @@ -170,7 +171,7 @@ describe('Test video channels', function () { { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, start: 1, count: 1, sort: '-createdAt' @@ -187,7 +188,7 @@ describe('Test video channels', function () { it('Should have one video channel when getting account channels on server 2', async function () { const res = await getAccountVideoChannelsList({ url: servers[1].url, - accountName: userInfo.account.name + '@' + userInfo.account.host + accountName }) expect(res.body.total).to.equal(1) @@ -287,6 +288,10 @@ describe('Test video channels', function () { const videoChannel = await findChannel(server, secondVideoChannelId) await testImage(server.url, 'avatar-resized', videoChannel.avatar.path, '.png') + + const row = await getActorImage(server.internalServerNumber, basename(videoChannel.avatar.path)) + expect(row.height).to.equal(ACTOR_IMAGES_SIZE.AVATARS.height) + expect(row.width).to.equal(ACTOR_IMAGES_SIZE.AVATARS.width) } }) @@ -306,9 +311,14 @@ describe('Test video channels', function () { await waitJobs(servers) for (const server of servers) { - const videoChannel = await findChannel(server, secondVideoChannelId) + const res = await getVideoChannel(server.url, 'second_video_channel@' + servers[0].host) + const videoChannel = res.body await testImage(server.url, 'banner-resized', videoChannel.banner.path) + + const row = await getActorImage(server.internalServerNumber, basename(videoChannel.banner.path)) + expect(row.height).to.equal(ACTOR_IMAGES_SIZE.BANNERS.height) + expect(row.width).to.equal(ACTOR_IMAGES_SIZE.BANNERS.width) } }) @@ -366,7 +376,7 @@ describe('Test video channels', function () { it('Should change the video channel of a video', async function () { this.timeout(10000) - await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: firstVideoChannelId }) + await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: servers[0].videoChannel.id }) await waitJobs(servers) }) @@ -406,7 +416,8 @@ 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) + const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel) + totoChannel = res.body.videoChannel.id } { @@ -425,7 +436,7 @@ describe('Test video channels', function () { { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, withStats: true }) @@ -443,7 +454,7 @@ describe('Test video channels', function () { } { - // video has been posted on channel firstVideoChannelId since last update + // video has been posted on channel servers[0].videoChannel.id 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') @@ -452,10 +463,10 @@ describe('Test video channels', function () { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, withStats: true }) - const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === firstVideoChannelId) + const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === servers[0].videoChannel.id) expect(channelWithView.viewsPerDay.slice(-1)[0].views).to.equal(2) } }) @@ -463,7 +474,7 @@ describe('Test video channels', function () { it('Should report correct videos count', async function () { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, withStats: true }) const channels: VideoChannel[] = res.body.data @@ -479,7 +490,7 @@ describe('Test video channels', function () { { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, search: 'root' }) expect(res.body.total).to.equal(1) @@ -491,7 +502,7 @@ describe('Test video channels', function () { { const res = await getAccountVideoChannelsList({ url: servers[0].url, - accountName: userInfo.account.name + '@' + userInfo.account.host, + accountName, search: 'does not exist' }) expect(res.body.total).to.equal(0) @@ -501,6 +512,40 @@ describe('Test video channels', function () { } }) + it('Should list channels by updatedAt desc if a video has been uploaded', async function () { + this.timeout(30000) + + await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: totoChannel }) + await waitJobs(servers) + + for (const server of servers) { + const res = await getAccountVideoChannelsList({ + url: server.url, + accountName, + sort: '-updatedAt' + }) + + const channels: VideoChannel[] = res.body.data + expect(channels[0].name).to.equal('toto_channel') + expect(channels[1].name).to.equal('root_channel') + } + + await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: servers[0].videoChannel.id }) + await waitJobs(servers) + + for (const server of servers) { + const res = await getAccountVideoChannelsList({ + url: server.url, + accountName, + sort: '-updatedAt' + }) + + const channels: VideoChannel[] = res.body.data + expect(channels[0].name).to.equal('root_channel') + expect(channels[1].name).to.equal('toto_channel') + } + }) + after(async function () { await cleanupTests(servers) })