From 0f320037e689b2778959c12ddd4ce790f6e4ae4f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 May 2018 15:10:13 +0200 Subject: Add ability to update a video channel --- server/tests/api/videos/video-channels.ts | 78 ++++++++++++++++++++++--------- server/tests/utils/videos/videos.ts | 15 +++--- 2 files changed, 66 insertions(+), 27 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 585b6a2b5..35c418f7c 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -2,8 +2,8 @@ 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 { doubleFollow, flushAndRunMultipleServers, getVideoChannelVideos, updateVideo, uploadVideo, wait } from '../../utils' import { addVideoChannel, deleteVideoChannel, @@ -25,8 +25,11 @@ describe('Test video channels', function () { let servers: ServerInfo[] let userInfo: User let accountUUID: string - let videoChannelId: number - let videoChannelUUID: string + let firstVideoChannelId: number + let firstVideoChannelUUID: string + let secondVideoChannelId: number + let secondVideoChannelUUID: string + let videoUUID: string before(async function () { this.timeout(30000) @@ -42,6 +45,9 @@ 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 wait(5000) @@ -58,17 +64,22 @@ describe('Test video channels', function () { it('Should create another video channel', async function () { this.timeout(10000) - const videoChannel = { - displayName: 'second video channel', - description: 'super video channel description', - support: 'super video channel support text' + { + const videoChannel = { + 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 } - const res = await addVideoChannel(servers[0].url, servers[0].accessToken, 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) }) @@ -130,7 +141,7 @@ describe('Test video channels', function () { support: 'video channel support text updated' } - await updateVideoChannel(servers[0].url, servers[0].accessToken, videoChannelId, videoChannelAttributes) + await updateVideoChannel(servers[0].url, servers[0].accessToken, secondVideoChannelId, videoChannelAttributes) await wait(3000) }) @@ -149,7 +160,7 @@ describe('Test video channels', function () { }) it('Should get video channel', async function () { - const res = await getVideoChannel(servers[0].url, videoChannelId) + const res = await getVideoChannel(servers[0].url, secondVideoChannelId) const videoChannel = res.body expect(videoChannel.displayName).to.equal('video channel updated') @@ -157,20 +168,45 @@ describe('Test video channels', function () { 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, 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 res1 = await getVideoChannelVideos(server.url, server.accessToken, secondVideoChannelUUID, 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 wait(5000) + }) + + it('Should list the first video channel videos', async function () { + this.timeout(10000) + + for (const server of servers) { + const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondVideoChannelUUID, 0, 5) + expect(res1.body.total).to.equal(0) + + const res2 = await getVideoChannelVideos(server.url, server.accessToken, firstVideoChannelUUID, 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, videoChannelId) + await deleteVideoChannel(servers[0].url, servers[0].accessToken, secondVideoChannelId) }) it('Should have video channel deleted', async function () { diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 870dfd21f..07c4ffc77 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -15,7 +15,7 @@ import { ServerInfo, testImage } from '../' -import { VideoPrivacy } from '../../../../shared/models/videos' +import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos' import { readdirPromise } from '../../../helpers/core-utils' import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers' import { dateIsValid, webtorrentAdd } from '../index' @@ -385,6 +385,7 @@ function updateVideo (url: string, accessToken: string, id: number | string, att if (attributes.description) body['description'] = attributes.description if (attributes.tags) body['tags'] = attributes.tags if (attributes.privacy) body['privacy'] = attributes.privacy + if (attributes.channelId) body['channelId'] = attributes.channelId // Upload request if (attributes.thumbnailfile || attributes.previewfile) { @@ -489,6 +490,8 @@ async function completeVideoCheck ( expect(video.account.uuid).to.be.a('string') expect(video.account.host).to.equal(attributes.account.host) expect(video.account.name).to.equal(attributes.account.name) + expect(video.channel.displayName).to.equal(attributes.channel.name) + expect(video.channel.name).to.have.lengthOf(36) expect(video.likes).to.equal(attributes.likes) expect(video.dislikes).to.equal(attributes.dislikes) expect(video.isLocal).to.equal(attributes.isLocal) @@ -498,19 +501,19 @@ async function completeVideoCheck ( expect(dateIsValid(video.updatedAt)).to.be.true const res = await getVideo(url, video.uuid) - const videoDetails = res.body + const videoDetails: VideoDetails = res.body expect(videoDetails.files).to.have.lengthOf(attributes.files.length) expect(videoDetails.tags).to.deep.equal(attributes.tags) expect(videoDetails.account.name).to.equal(attributes.account.name) expect(videoDetails.account.host).to.equal(attributes.account.host) - expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) - expect(videoDetails.channel.displayName).to.equal(attributes.channel.name) expect(videoDetails.channel.name).to.have.lengthOf(36) + expect(videoDetails.channel.host).to.equal(attributes.account.host) expect(videoDetails.channel.isLocal).to.equal(attributes.channel.isLocal) - expect(dateIsValid(videoDetails.channel.createdAt)).to.be.true - expect(dateIsValid(videoDetails.channel.updatedAt)).to.be.true + expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true + expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true + expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) for (const attributeFile of attributes.files) { const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution) -- cgit v1.2.3