X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-channels.ts;h=f091484049ba5548c3e397db31c20fa9aa522e07;hb=7243f84db0f34c6d5610a54603b0cce7c284a7b3;hp=04e7b8c6ac28f225f19a40e264501cf2b0d49746;hpb=6b738c7a31591a83fdcd9c78b6b1f98e543c378b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 04e7b8c6a..f09148404 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -2,8 +2,19 @@ import * as chai from 'chai' import 'mocha' -import { User } from '../../../../shared/index' -import { doubleFollow, flushAndRunMultipleServers, getVideoChannelVideos, uploadVideo, wait } from '../../utils' +import { User, Video } from '../../../../shared/index' +import { + cleanupTests, + createUser, + doubleFollow, + flushAndRunMultipleServers, + getVideoChannelVideos, + testImage, + updateVideo, + updateVideoChannelAvatar, + uploadVideo, + userLogin +} from '../../../../shared/extra-utils' import { addVideoChannel, deleteVideoChannel, @@ -16,8 +27,8 @@ import { ServerInfo, setAccessTokensToServers, updateVideoChannel -} from '../../utils/index' -import { getAccountsList } from '../../utils/users/accounts' +} from '../../../../shared/extra-utils/index' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' const expect = chai.expect @@ -25,14 +36,13 @@ describe('Test video channels', function () { let servers: ServerInfo[] let userInfo: User let accountUUID: string - let videoChannelId: number - let videoChannelUUID: string + let firstVideoChannelId: number + let secondVideoChannelId: number + let videoUUID: string before(async function () { this.timeout(30000) - await flushTests() - servers = await flushAndRunMultipleServers(2) await setAccessTokensToServers(servers) @@ -42,9 +52,11 @@ describe('Test video channels', function () { const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) const user: User = res.body accountUUID = user.account.uuid + + firstVideoChannelId = user.videoChannels[0].id } - await wait(5000) + await waitJobs(servers) }) it('Should have one video channel (created with root)', async () => { @@ -58,19 +70,24 @@ describe('Test video channels', function () { it('Should create another video channel', async function () { this.timeout(10000) - const videoChannel = { - name: 'second video channel', - description: 'super video channel description', - support: 'super video channel support text' + { + const videoChannel = { + name: 'second_video_channel', + displayName: 'second video channel', + description: 'super video channel description', + support: 'super video channel support text' + } + const res = await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel) + secondVideoChannelId = res.body.videoChannel.id } - const res = await addVideoChannel(servers[0].url, servers[0].accessToken, accountUUID, videoChannel) - videoChannelId = res.body.videoChannel.id - videoChannelUUID = res.body.videoChannel.uuid // The channel is 1 is propagated to servers 2 - await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'my video name', channelId: videoChannelId }) + { + const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, { name: 'my video name', channelId: secondVideoChannelId }) + videoUUID = res.body.video.uuid + } - await wait(3000) + await waitJobs(servers) }) it('Should have two video channels when getting my information', async () => { @@ -81,32 +98,39 @@ describe('Test video channels', function () { expect(userInfo.videoChannels).to.have.lengthOf(2) const videoChannels = userInfo.videoChannels - expect(videoChannels[0].displayName).to.equal('Default root channel') + expect(videoChannels[0].name).to.equal('root_channel') + expect(videoChannels[0].displayName).to.equal('Main root channel') + + expect(videoChannels[1].name).to.equal('second_video_channel') 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') }) it('Should have two video channels when getting account channels on server 1', async function () { - const res = await getAccountVideoChannelsList(servers[0].url, userInfo.account.uuid) + const res = await getAccountVideoChannelsList(servers[0].url, userInfo.account.name + '@' + userInfo.account.host) expect(res.body.total).to.equal(2) expect(res.body.data).to.be.an('array') expect(res.body.data).to.have.lengthOf(2) const videoChannels = res.body.data - expect(videoChannels[0].displayName).to.equal('Default root channel') + expect(videoChannels[0].name).to.equal('root_channel') + expect(videoChannels[0].displayName).to.equal('Main root channel') + + expect(videoChannels[1].name).to.equal('second_video_channel') 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') }) it('Should have one video channel when getting account channels on server 2', async function () { - const res = await getAccountVideoChannelsList(servers[1].url, userInfo.account.uuid) + const res = await getAccountVideoChannelsList(servers[1].url, userInfo.account.name + '@' + userInfo.account.host) expect(res.body.total).to.equal(1) expect(res.body.data).to.be.an('array') expect(res.body.data).to.have.lengthOf(1) const videoChannels = res.body.data + expect(videoChannels[0].name).to.equal('second_video_channel') expect(videoChannels[0].displayName).to.equal('second video channel') expect(videoChannels[0].description).to.equal('super video channel description') expect(videoChannels[0].support).to.equal('super video channel support text') @@ -118,21 +142,22 @@ describe('Test video channels', function () { expect(res.body.total).to.equal(2) expect(res.body.data).to.be.an('array') expect(res.body.data).to.have.lengthOf(1) - expect(res.body.data[0].displayName).to.equal('Default root channel') + expect(res.body.data[0].name).to.equal('root_channel') + expect(res.body.data[0].displayName).to.equal('Main root channel') }) it('Should update video channel', async function () { this.timeout(5000) const videoChannelAttributes = { - name: 'video channel updated', + displayName: 'video channel updated', description: 'video channel description updated', support: 'video channel support text updated' } - await updateVideoChannel(servers[0].url, servers[0].accessToken, accountUUID, videoChannelId, videoChannelAttributes) + await updateVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel', videoChannelAttributes) - await wait(3000) + await waitJobs(servers) }) it('Should have video channel updated', async function () { @@ -142,35 +167,90 @@ describe('Test video channels', function () { expect(res.body.total).to.equal(2) expect(res.body.data).to.be.an('array') expect(res.body.data).to.have.lengthOf(1) + expect(res.body.data[0].name).to.equal('second_video_channel') expect(res.body.data[0].displayName).to.equal('video channel updated') expect(res.body.data[0].description).to.equal('video channel description updated') expect(res.body.data[0].support).to.equal('video channel support text updated') } }) + it('Should update video channel avatar', async function () { + this.timeout(5000) + + const fixture = 'avatar.png' + + await updateVideoChannelAvatar({ + url: servers[0].url, + accessToken: servers[0].accessToken, + videoChannelName: 'second_video_channel', + fixture + }) + + await waitJobs(servers) + }) + + it('Should have video channel avatar updated', async function () { + for (const server of servers) { + const res = await getVideoChannelsList(server.url, 0, 1, '-name') + + const videoChannel = res.body.data.find(c => c.id === secondVideoChannelId) + + await testImage(server.url, 'avatar-resized', videoChannel.avatar.path, '.png') + } + }) + it('Should get video channel', async function () { - const res = await getVideoChannel(servers[0].url, accountUUID, videoChannelId) + const res = await getVideoChannel(servers[0].url, 'second_video_channel') const videoChannel = res.body + expect(videoChannel.name).to.equal('second_video_channel') expect(videoChannel.displayName).to.equal('video channel updated') expect(videoChannel.description).to.equal('video channel description updated') expect(videoChannel.support).to.equal('video channel support text updated') }) - it('Should list the video channel videos', async function () { + it('Should list the second video channel videos', async function () { this.timeout(10000) for (const server of servers) { - const res = await getVideoChannelVideos(server.url, server.accessToken, accountUUID, videoChannelUUID, 0, 5) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(1) - expect(res.body.data[0].name).to.equal('my video name') + const channelURI = 'second_video_channel@localhost:' + server.port + const res1 = await getVideoChannelVideos(server.url, server.accessToken, channelURI, 0, 5) + expect(res1.body.total).to.equal(1) + expect(res1.body.data).to.be.an('array') + expect(res1.body.data).to.have.lengthOf(1) + expect(res1.body.data[0].name).to.equal('my video name') + } + }) + + 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 waitJobs(servers) + }) + + it('Should list the first video channel videos', async function () { + this.timeout(10000) + + for (const server of servers) { + const secondChannelURI = 'second_video_channel@localhost:' + server.port + const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondChannelURI, 0, 5) + expect(res1.body.total).to.equal(0) + + const channelURI = 'root_channel@localhost:' + server.port + const res2 = await getVideoChannelVideos(server.url, server.accessToken, channelURI, 0, 5) + expect(res2.body.total).to.equal(1) + + const videos: Video[] = res2.body.data + expect(videos).to.be.an('array') + expect(videos).to.have.lengthOf(1) + expect(videos[0].name).to.equal('my video name') } }) it('Should delete video channel', async function () { - await deleteVideoChannel(servers[0].url, servers[0].accessToken, accountUUID, videoChannelId) + await deleteVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel') }) it('Should have video channel deleted', async function () { @@ -179,15 +259,26 @@ describe('Test video channels', function () { expect(res.body.total).to.equal(1) expect(res.body.data).to.be.an('array') expect(res.body.data).to.have.lengthOf(1) - expect(res.body.data[0].displayName).to.equal('Default root channel') + expect(res.body.data[0].displayName).to.equal('Main root channel') }) - after(async function () { - killallServers(servers) + 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) + } - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() + { + 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 ] + 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}/) } }) + + after(async function () { + await cleanupTests(servers) + }) })