X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-channels.ts;h=4f600cae8eefb11ecd2be702734aeb26ca0810cb;hb=941c5eac1751ef93500d6afa58c4575f777dbff9;hp=e4e3ce9d9e78a2498b8d197e81eb4118e5fa6fd1;hpb=4bbfc6c606c8d3794bae25c64c516120af41f4eb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index e4e3ce9d9..4f600cae8 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -2,46 +2,43 @@ import * as chai from 'chai' import 'mocha' -import { User, Video } from '../../../../shared/index' +import { User, Video, VideoChannel, VideoDetails } from '../../../../shared/index' import { + cleanupTests, + createUser, doubleFollow, - flushAndRunMultipleServers, - getVideoChannelVideos, testImage, + flushAndRunMultipleServers, getVideo, + getVideoChannelVideos, + testImage, updateVideo, updateVideoChannelAvatar, - uploadVideo, wait -} from '../../utils' + uploadVideo, + userLogin +} from '../../../../shared/extra-utils' import { addVideoChannel, deleteVideoChannel, - flushTests, getAccountVideoChannelsList, getMyUserInformation, getVideoChannel, getVideoChannelsList, - killallServers, ServerInfo, setAccessTokensToServers, updateVideoChannel -} from '../../utils/index' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/extra-utils/index' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' const expect = chai.expect describe('Test video channels', function () { let servers: ServerInfo[] let userInfo: User - let accountUUID: string let firstVideoChannelId: number - let firstVideoChannelUUID: string let secondVideoChannelId: number - let secondVideoChannelUUID: string let videoUUID: string before(async function () { - this.timeout(30000) - - await flushTests() + this.timeout(60000) servers = await flushAndRunMultipleServers(2) @@ -51,10 +48,8 @@ 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 - firstVideoChannelUUID = user.videoChannels[0].uuid } await waitJobs(servers) @@ -73,18 +68,19 @@ describe('Test video channels', function () { { 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 - secondVideoChannelUUID = res.body.videoChannel.uuid } // The channel is 1 is propagated to servers 2 { - const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, { name: 'my video name', channelId: secondVideoChannelId }) + const videoAttributesArg = { name: 'my video name', channelId: secondVideoChannelId, support: 'video support field' } + const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributesArg) videoUUID = res.body.video.uuid } @@ -99,32 +95,97 @@ 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.name + '@' + userInfo.account.host) + const res = await getAccountVideoChannelsList({ + url: servers[ 0 ].url, + accountName: 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 paginate and sort account channels', async function () { + { + const res = await getAccountVideoChannelsList({ + url: servers[ 0 ].url, + accountName: userInfo.account.name + '@' + userInfo.account.host, + start: 0, + count: 1, + sort: 'createdAt' + }) + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.have.lengthOf(1) + + const videoChannel: VideoChannel = res.body.data[ 0 ] + expect(videoChannel.name).to.equal('root_channel') + } + + { + const res = await getAccountVideoChannelsList({ + url: servers[ 0 ].url, + accountName: userInfo.account.name + '@' + userInfo.account.host, + start: 0, + count: 1, + sort: '-createdAt' + }) + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.have.lengthOf(1) + + const videoChannel: VideoChannel = res.body.data[ 0 ] + expect(videoChannel.name).to.equal('second_video_channel') + } + + { + const res = await getAccountVideoChannelsList({ + url: servers[ 0 ].url, + accountName: userInfo.account.name + '@' + userInfo.account.host, + start: 1, + count: 1, + sort: '-createdAt' + }) + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.have.lengthOf(1) + + 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(servers[1].url, userInfo.account.name + '@' + userInfo.account.host) + const res = await getAccountVideoChannelsList({ + url: servers[ 1 ].url, + accountName: 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') @@ -136,19 +197,20 @@ 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) + this.timeout(15000) const videoChannelAttributes = { displayName: 'video channel updated', description: 'video channel description updated', - support: 'video channel support text updated' + support: 'support updated' } - await updateVideoChannel(servers[0].url, servers[0].accessToken, secondVideoChannelId, videoChannelAttributes) + await updateVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel', videoChannelAttributes) await waitJobs(servers) }) @@ -160,9 +222,39 @@ 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') + expect(res.body.data[0].support).to.equal('support updated') + } + }) + + it('Should not have updated the video support field', async function () { + for (const server of servers) { + const res = await getVideo(server.url, videoUUID) + const video: VideoDetails = res.body + + expect(video.support).to.equal('video support field') + } + }) + + it('Should update the channel support field and update videos too', async function () { + this.timeout(35000) + + const videoChannelAttributes = { + support: 'video channel support text updated', + bulkVideosSupportUpdate: true + } + + await updateVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel', videoChannelAttributes) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideo(server.url, videoUUID) + const video: VideoDetails = res.body + + expect(video.support).to.equal(videoChannelAttributes.support) } }) @@ -174,7 +266,7 @@ describe('Test video channels', function () { await updateVideoChannelAvatar({ url: servers[0].url, accessToken: servers[0].accessToken, - videoChannelId: secondVideoChannelId, + videoChannelName: 'second_video_channel', fixture }) @@ -192,9 +284,10 @@ describe('Test video channels', function () { }) it('Should get video channel', async function () { - const res = await getVideoChannel(servers[0].url, secondVideoChannelId) + 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') @@ -204,7 +297,8 @@ describe('Test video channels', function () { this.timeout(10000) for (const server of servers) { - const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondVideoChannelUUID, 0, 5) + const channelURI = 'second_video_channel@localhost:' + servers[0].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) @@ -224,10 +318,12 @@ describe('Test video channels', function () { this.timeout(10000) for (const server of servers) { - const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondVideoChannelUUID, 0, 5) + const secondChannelURI = 'second_video_channel@localhost:' + servers[0].port + const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondChannelURI, 0, 5) expect(res1.body.total).to.equal(0) - const res2 = await getVideoChannelVideos(server.url, server.accessToken, firstVideoChannelUUID, 0, 5) + const channelURI = 'root_channel@localhost:' + servers[0].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 @@ -238,7 +334,7 @@ describe('Test video channels', function () { }) it('Should delete video channel', async function () { - await deleteVideoChannel(servers[0].url, servers[0].accessToken, secondVideoChannelId) + await deleteVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel') }) it('Should have video channel deleted', async function () { @@ -247,10 +343,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') + }) + + 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 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 () { - killallServers(servers) + await cleanupTests(servers) }) })