import * as chai from 'chai'
import { basename } from 'path'
import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
+import { testFileExistsOrNot, testImage } from '@server/tests/shared'
+import { wait } from '@shared/core-utils'
+import { ActorImageType, User, VideoChannel } from '@shared/models'
import {
cleanupTests,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
+ setDefaultAccountAvatar,
setDefaultVideoChannel,
- testFileExistsOrNot,
- testImage,
- wait,
waitJobs
-} from '@shared/extra-utils'
-import { User, VideoChannel } from '@shared/models'
+} from '@shared/server-commands'
const expect = chai.expect
-async function findChannel (server: ServerInfo, channelId: number) {
- const body = await server.channelsCommand.list({ sort: '-name' })
+async function findChannel (server: PeerTubeServer, channelId: number) {
+ const body = await server.channels.list({ sort: '-name' })
return body.data.find(c => c.id === channelId)
}
describe('Test video channels', function () {
- let servers: ServerInfo[]
+ let servers: PeerTubeServer[]
let userInfo: User
let secondVideoChannelId: number
let totoChannel: number
let videoUUID: string
let accountName: string
+ let secondUserChannelName: string
const avatarPaths: { [ port: number ]: string } = {}
const bannerPaths: { [ port: number ]: string } = {}
before(async function () {
this.timeout(60000)
- servers = await flushAndRunMultipleServers(2)
+ servers = await createMultipleServers(2)
await setAccessTokensToServers(servers)
await setDefaultVideoChannel(servers)
+ await setDefaultAccountAvatar(servers)
await doubleFollow(servers[0], servers[1])
})
it('Should have one video channel (created with root)', async () => {
- const body = await servers[0].channelsCommand.list({ start: 0, count: 2 })
+ const body = await servers[0].channels.list({ start: 0, count: 2 })
expect(body.total).to.equal(1)
expect(body.data).to.be.an('array')
description: 'super video channel description',
support: 'super video channel support text'
}
- const created = await servers[0].channelsCommand.create({ attributes: videoChannel })
+ const created = await servers[0].channels.create({ attributes: videoChannel })
secondVideoChannelId = created.id
}
// The channel is 1 is propagated to servers 2
{
const attributes = { name: 'my video name', channelId: secondVideoChannelId, support: 'video support field' }
- const { uuid } = await servers[0].videosCommand.upload({ attributes })
+ const { uuid } = await servers[0].videos.upload({ attributes })
videoUUID = uuid
}
})
it('Should have two video channels when getting my information', async () => {
- userInfo = await servers[0].usersCommand.getMyInfo()
+ userInfo = await servers[0].users.getMyInfo()
expect(userInfo.videoChannels).to.be.an('array')
expect(userInfo.videoChannels).to.have.lengthOf(2)
})
it('Should have two video channels when getting account channels on server 1', async function () {
- const body = await servers[0].channelsCommand.listByAccount({ accountName })
+ const body = await servers[0].channels.listByAccount({ accountName })
expect(body.total).to.equal(2)
const videoChannels = body.data
it('Should paginate and sort account channels', async function () {
{
- const body = await servers[0].channelsCommand.listByAccount({
+ const body = await servers[0].channels.listByAccount({
accountName,
start: 0,
count: 1,
}
{
- const body = await servers[0].channelsCommand.listByAccount({
+ const body = await servers[0].channels.listByAccount({
accountName,
start: 0,
count: 1,
}
{
- const body = await servers[0].channelsCommand.listByAccount({
+ const body = await servers[0].channels.listByAccount({
accountName,
start: 1,
count: 1,
})
it('Should have one video channel when getting account channels on server 2', async function () {
- const body = await servers[1].channelsCommand.listByAccount({ accountName })
+ const body = await servers[1].channels.listByAccount({ accountName })
expect(body.total).to.equal(1)
expect(body.data).to.be.an('array')
})
it('Should list video channels', async function () {
- const body = await servers[0].channelsCommand.list({ start: 1, count: 1, sort: '-name' })
+ const body = await servers[0].channels.list({ start: 1, count: 1, sort: '-name' })
expect(body.total).to.equal(2)
expect(body.data).to.be.an('array')
support: 'support updated'
}
- await servers[0].channelsCommand.update({ channelName: 'second_video_channel', attributes: videoChannelAttributes })
+ await servers[0].channels.update({ channelName: 'second_video_channel', attributes: videoChannelAttributes })
await waitJobs(servers)
})
it('Should have video channel updated', async function () {
for (const server of servers) {
- const body = await server.channelsCommand.list({ start: 0, count: 1, sort: '-name' })
+ const body = await server.channels.list({ start: 0, count: 1, sort: '-name' })
expect(body.total).to.equal(2)
expect(body.data).to.be.an('array')
it('Should not have updated the video support field', async function () {
for (const server of servers) {
- const video = await server.videosCommand.get({ id: videoUUID })
+ const video = await server.videos.get({ id: videoUUID })
expect(video.support).to.equal('video support field')
}
})
+ it('Should update another accounts video channel', async function () {
+ this.timeout(15000)
+
+ const result = await servers[0].users.generate('second_user')
+ secondUserChannelName = result.userChannelName
+
+ await servers[0].videos.quickUpload({ name: 'video', token: result.token })
+
+ const videoChannelAttributes = {
+ displayName: 'video channel updated',
+ description: 'video channel description updated',
+ support: 'support updated'
+ }
+
+ await servers[0].channels.update({ channelName: secondUserChannelName, attributes: videoChannelAttributes })
+
+ await waitJobs(servers)
+ })
+
+ it('Should have another accounts video channel updated', async function () {
+ for (const server of servers) {
+ const body = await server.channels.get({ channelName: `${secondUserChannelName}@${servers[0].host}` })
+
+ expect(body.displayName).to.equal('video channel updated')
+ expect(body.description).to.equal('video channel description updated')
+ expect(body.support).to.equal('support updated')
+ }
+ })
+
it('Should update the channel support field and update videos too', async function () {
this.timeout(35000)
bulkVideosSupportUpdate: true
}
- await servers[0].channelsCommand.update({ channelName: 'second_video_channel', attributes: videoChannelAttributes })
+ await servers[0].channels.update({ channelName: 'second_video_channel', attributes: videoChannelAttributes })
await waitJobs(servers)
for (const server of servers) {
- const video = await server.videosCommand.get({ id: videoUUID })
+ const video = await server.videos.get({ id: videoUUID })
expect(video.support).to.equal(videoChannelAttributes.support)
}
})
const fixture = 'avatar.png'
- await servers[0].channelsCommand.updateImage({
+ await servers[0].channels.updateImage({
channelName: 'second_video_channel',
fixture,
type: 'avatar'
for (const server of servers) {
const videoChannel = await findChannel(server, secondVideoChannelId)
+ const expectedSizes = ACTOR_IMAGES_SIZE[ActorImageType.AVATAR]
+
+ expect(videoChannel.avatars.length).to.equal(expectedSizes.length, 'Expected avatars to be generated in all sizes')
- avatarPaths[server.port] = videoChannel.avatar.path
- await testImage(server.url, 'avatar-resized', avatarPaths[server.port], '.png')
- await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), true)
+ for (const avatar of videoChannel.avatars) {
+ avatarPaths[server.port] = avatar.path
+ await testImage(server.url, `avatar-resized-${avatar.width}x${avatar.width}`, avatarPaths[server.port], '.png')
+ await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), true)
- const row = await server.sqlCommand.getActorImage(basename(avatarPaths[server.port]))
- expect(row.height).to.equal(ACTOR_IMAGES_SIZE.AVATARS.height)
- expect(row.width).to.equal(ACTOR_IMAGES_SIZE.AVATARS.width)
+ const row = await server.sql.getActorImage(basename(avatarPaths[server.port]))
+
+ expect(expectedSizes.some(({ height, width }) => row.height === height && row.width === width)).to.equal(true)
+ }
}
})
const fixture = 'banner.jpg'
- await servers[0].channelsCommand.updateImage({
+ await servers[0].channels.updateImage({
channelName: 'second_video_channel',
fixture,
type: 'banner'
await waitJobs(servers)
for (const server of servers) {
- const videoChannel = await server.channelsCommand.get({ channelName: 'second_video_channel@' + servers[0].host })
+ const videoChannel = await server.channels.get({ channelName: 'second_video_channel@' + servers[0].host })
- bannerPaths[server.port] = videoChannel.banner.path
+ bannerPaths[server.port] = videoChannel.banners[0].path
await testImage(server.url, 'banner-resized', bannerPaths[server.port])
await testFileExistsOrNot(server, 'avatars', basename(bannerPaths[server.port]), true)
- const row = await server.sqlCommand.getActorImage(basename(bannerPaths[server.port]))
- expect(row.height).to.equal(ACTOR_IMAGES_SIZE.BANNERS.height)
- expect(row.width).to.equal(ACTOR_IMAGES_SIZE.BANNERS.width)
+ const row = await server.sql.getActorImage(basename(bannerPaths[server.port]))
+ expect(row.height).to.equal(ACTOR_IMAGES_SIZE[ActorImageType.BANNER][0].height)
+ expect(row.width).to.equal(ACTOR_IMAGES_SIZE[ActorImageType.BANNER][0].width)
+ }
+ })
+
+ it('Should still correctly list channels', async function () {
+ {
+ const body = await servers[0].channels.list({ start: 1, count: 1, sort: 'createdAt' })
+
+ expect(body.total).to.equal(3)
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].name).to.equal('second_video_channel')
+ }
+
+ {
+ const body = await servers[0].channels.listByAccount({ accountName, start: 1, count: 1, sort: 'createdAt' })
+
+ expect(body.total).to.equal(2)
+ expect(body.data).to.have.lengthOf(1)
+ expect(body.data[0].name).to.equal('second_video_channel')
}
})
it('Should delete the video channel avatar', async function () {
this.timeout(15000)
-
- await servers[0].channelsCommand.deleteImage({ channelName: 'second_video_channel', type: 'avatar' })
+ await servers[0].channels.deleteImage({ channelName: 'second_video_channel', type: 'avatar' })
await waitJobs(servers)
const videoChannel = await findChannel(server, secondVideoChannelId)
await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), false)
- expect(videoChannel.avatar).to.be.null
+ expect(videoChannel.avatars).to.be.empty
}
})
it('Should delete the video channel banner', async function () {
this.timeout(15000)
- await servers[0].channelsCommand.deleteImage({ channelName: 'second_video_channel', type: 'banner' })
+ await servers[0].channels.deleteImage({ channelName: 'second_video_channel', type: 'banner' })
await waitJobs(servers)
const videoChannel = await findChannel(server, secondVideoChannelId)
await testFileExistsOrNot(server, 'avatars', basename(bannerPaths[server.port]), false)
- expect(videoChannel.banner).to.be.null
+ expect(videoChannel.banners).to.be.empty
}
})
for (const server of servers) {
const channelURI = 'second_video_channel@localhost:' + servers[0].port
- const { total, data } = await server.videosCommand.listByChannel({ videoChannelName: channelURI })
+ const { total, data } = await server.videos.listByChannel({ handle: channelURI })
expect(total).to.equal(1)
expect(data).to.be.an('array')
it('Should change the video channel of a video', async function () {
this.timeout(10000)
- await servers[0].videosCommand.update({ id: videoUUID, attributes: { channelId: servers[0].videoChannel.id } })
+ await servers[0].videos.update({ id: videoUUID, attributes: { channelId: servers[0].store.channel.id } })
await waitJobs(servers)
})
for (const server of servers) {
{
const secondChannelURI = 'second_video_channel@localhost:' + servers[0].port
- const { total } = await server.videosCommand.listByChannel({ videoChannelName: secondChannelURI })
+ const { total } = await server.videos.listByChannel({ handle: secondChannelURI })
expect(total).to.equal(0)
}
{
const channelURI = 'root_channel@localhost:' + servers[0].port
- const { total, data } = await server.videosCommand.listByChannel({ videoChannelName: channelURI })
+ const { total, data } = await server.videos.listByChannel({ handle: channelURI })
expect(total).to.equal(1)
expect(data).to.be.an('array')
})
it('Should delete video channel', async function () {
- await servers[0].channelsCommand.delete({ channelName: 'second_video_channel' })
+ await servers[0].channels.delete({ channelName: 'second_video_channel' })
})
it('Should have video channel deleted', async function () {
- const body = await servers[0].channelsCommand.list({ start: 0, count: 10 })
+ const body = await servers[0].channels.list({ start: 0, count: 10, sort: 'createdAt' })
- expect(body.total).to.equal(1)
+ expect(body.total).to.equal(2)
expect(body.data).to.be.an('array')
- expect(body.data).to.have.lengthOf(1)
+ expect(body.data).to.have.lengthOf(2)
expect(body.data[0].displayName).to.equal('Main root channel')
+ expect(body.data[1].displayName).to.equal('video channel updated')
})
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' }
- const created = await servers[0].channelsCommand.create({ attributes: videoChannel })
+ const created = await servers[0].channels.create({ attributes: videoChannel })
totoChannel = created.id
}
{
- await servers[0].usersCommand.create({ username: 'toto', password: 'password' })
- const accessToken = await servers[0].loginCommand.getAccessToken({ username: 'toto', password: 'password' })
+ await servers[0].users.create({ username: 'toto', password: 'password' })
+ const accessToken = await servers[0].login.getAccessToken({ username: 'toto', password: 'password' })
- const { videoChannels } = await servers[0].usersCommand.getMyInfo({ token: accessToken })
+ const { videoChannels } = await servers[0].users.getMyInfo({ token: accessToken })
const videoChannel = 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}/)
}
this.timeout(10000)
{
- const { data } = await servers[0].channelsCommand.listByAccount({ accountName, withStats: true })
+ const { data } = await servers[0].channels.listByAccount({ accountName, withStats: true })
for (const channel of data) {
expect(channel).to.haveOwnProperty('viewsPerDay')
}
{
- // video has been posted on channel servers[0].videoChannel.id since last update
- await servers[0].videosCommand.view({ id: videoUUID, xForwardedFor: '0.0.0.1,127.0.0.1' })
- await servers[0].videosCommand.view({ id: videoUUID, xForwardedFor: '0.0.0.2,127.0.0.1' })
+ // video has been posted on channel servers[0].store.videoChannel.id since last update
+ await servers[0].views.simulateView({ id: videoUUID, xForwardedFor: '0.0.0.1,127.0.0.1' })
+ await servers[0].views.simulateView({ id: videoUUID, xForwardedFor: '0.0.0.2,127.0.0.1' })
// Wait the repeatable job
await wait(8000)
- const { data } = await servers[0].channelsCommand.listByAccount({ accountName, withStats: true })
- const channelWithView = data.find(channel => channel.id === servers[0].videoChannel.id)
+ const { data } = await servers[0].channels.listByAccount({ accountName, withStats: true })
+ const channelWithView = data.find(channel => channel.id === servers[0].store.channel.id)
expect(channelWithView.viewsPerDay.slice(-1)[0].views).to.equal(2)
}
})
it('Should report correct videos count', async function () {
- const { data } = await servers[0].channelsCommand.listByAccount({ accountName, withStats: true })
+ const { data } = await servers[0].channels.listByAccount({ accountName, withStats: true })
const totoChannel = data.find(c => c.name === 'toto_channel')
const rootChannel = data.find(c => c.name === 'root_channel')
it('Should search among account video channels', async function () {
{
- const body = await servers[0].channelsCommand.listByAccount({ accountName, search: 'root' })
+ const body = await servers[0].channels.listByAccount({ accountName, search: 'root' })
expect(body.total).to.equal(1)
const channels = body.data
}
{
- const body = await servers[0].channelsCommand.listByAccount({ accountName, search: 'does not exist' })
+ const body = await servers[0].channels.listByAccount({ accountName, search: 'does not exist' })
expect(body.total).to.equal(0)
const channels = body.data
it('Should list channels by updatedAt desc if a video has been uploaded', async function () {
this.timeout(30000)
- await servers[0].videosCommand.upload({ attributes: { channelId: totoChannel } })
+ await servers[0].videos.upload({ attributes: { channelId: totoChannel } })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.channelsCommand.listByAccount({ accountName, sort: '-updatedAt' })
+ const { data } = await server.channels.listByAccount({ accountName, sort: '-updatedAt' })
expect(data[0].name).to.equal('toto_channel')
expect(data[1].name).to.equal('root_channel')
}
- await servers[0].videosCommand.upload({ attributes: { channelId: servers[0].videoChannel.id } })
+ await servers[0].videos.upload({ attributes: { channelId: servers[0].store.channel.id } })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.channelsCommand.listByAccount({ accountName, sort: '-updatedAt' })
+ const { data } = await server.channels.listByAccount({ accountName, sort: '-updatedAt' })
expect(data[0].name).to.equal('root_channel')
expect(data[1].name).to.equal('toto_channel')
projects / github / Chocobozzz / PeerTube.git / blobdiff