checkActorFilesWereRemoved,
checkTmpIsEmpty,
checkVideoFilesWereRemoved,
+ saveVideoInServers,
+ testImage
+} from '@server/tests/shared'
+import { MyUser } from '@shared/models'
+import {
cleanupTests,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
- testImage,
+ setDefaultChannelAvatar,
waitJobs
-} from '@shared/extra-utils'
-import { User } from '@shared/models'
+} from '@shared/server-commands'
const expect = chai.expect
describe('Test users with multiple servers', function () {
- let servers: ServerInfo[] = []
- let user: User
+ let servers: PeerTubeServer[] = []
+
+ let user: MyUser
let userId: number
+
let videoUUID: string
let userAccessToken: string
- let userAvatarFilename: string
+ let userAvatarFilenames: string[]
before(async function () {
this.timeout(120_000)
- servers = await flushAndRunMultipleServers(3)
+ servers = await createMultipleServers(3)
// Get the access tokens
await setAccessTokensToServers(servers)
+ await setDefaultChannelAvatar(servers)
// Server 1 and server 2 follow each other
await doubleFollow(servers[0], servers[1])
await doubleFollow(servers[1], servers[2])
// The root user of server 1 is propagated to servers 2 and 3
- await servers[0].videosCommand.upload()
+ await servers[0].videos.upload()
{
- const user = {
- username: 'user1',
- password: 'password'
- }
- const created = await servers[0].usersCommand.create(user)
+ const username = 'user1'
+ const created = await servers[0].users.create({ username })
userId = created.id
- userAccessToken = await servers[0].loginCommand.getAccessToken(user)
+ userAccessToken = await servers[0].login.getAccessToken(username)
}
{
- const { uuid } = await servers[0].videosCommand.upload({ token: userAccessToken })
+ const { uuid } = await servers[0].videos.upload({ token: userAccessToken })
videoUUID = uuid
- }
- await waitJobs(servers)
+ await waitJobs(servers)
+
+ await saveVideoInServers(servers, videoUUID)
+ }
})
it('Should be able to update my display name', async function () {
this.timeout(10000)
- await servers[0].usersCommand.updateMe({ displayName: 'my super display name' })
+ await servers[0].users.updateMe({ displayName: 'my super display name' })
- user = await servers[0].usersCommand.getMyInfo()
+ user = await servers[0].users.getMyInfo()
expect(user.account.displayName).to.equal('my super display name')
await waitJobs(servers)
it('Should be able to update my description', async function () {
this.timeout(10_000)
- await servers[0].usersCommand.updateMe({ description: 'my super description updated' })
+ await servers[0].users.updateMe({ description: 'my super description updated' })
- user = await servers[0].usersCommand.getMyInfo()
+ user = await servers[0].users.getMyInfo()
expect(user.account.displayName).to.equal('my super display name')
expect(user.account.description).to.equal('my super description updated')
const fixture = 'avatar2.png'
- await servers[0].usersCommand.updateMyAvatar({ fixture })
+ await servers[0].users.updateMyAvatar({ fixture })
- user = await servers[0].usersCommand.getMyInfo()
- userAvatarFilename = user.account.avatar.path
+ user = await servers[0].users.getMyInfo()
+ userAvatarFilenames = user.account.avatars.map(({ path }) => path)
- await testImage(servers[0].url, 'avatar2-resized', userAvatarFilename, '.png')
+ for (const avatar of user.account.avatars) {
+ await testImage(servers[0].url, `avatar2-resized-${avatar.width}x${avatar.width}`, avatar.path, '.png')
+ }
await waitJobs(servers)
})
let createdAt: string | Date
for (const server of servers) {
- const body = await server.accountsCommand.list({ sort: '-createdAt' })
+ const body = await server.accounts.list({ sort: '-createdAt' })
const resList = body.data.find(a => a.name === 'root' && a.host === 'localhost:' + servers[0].port)
expect(resList).not.to.be.undefined
- const account = await server.accountsCommand.get({ accountName: resList.name + '@' + resList.host })
+ const account = await server.accounts.get({ accountName: resList.name + '@' + resList.host })
if (!createdAt) createdAt = account.createdAt
expect(account.userId).to.be.undefined
}
- await testImage(server.url, 'avatar2-resized', account.avatar.path, '.png')
+ for (const avatar of account.avatars) {
+ await testImage(server.url, `avatar2-resized-${avatar.width}x${avatar.width}`, avatar.path, '.png')
+ }
}
})
it('Should list account videos', async function () {
for (const server of servers) {
- const { total, data } = await server.videosCommand.listByAccount({ accountName: 'user1@localhost:' + servers[0].port })
+ const { total, data } = await server.videos.listByAccount({ handle: 'user1@localhost:' + servers[0].port })
expect(total).to.equal(1)
expect(data).to.be.an('array')
it('Should search through account videos', async function () {
this.timeout(10_000)
- const created = await servers[0].videosCommand.upload({ token: userAccessToken, attributes: { name: 'Kami no chikara' } })
+ const created = await servers[0].videos.upload({ token: userAccessToken, attributes: { name: 'Kami no chikara' } })
await waitJobs(servers)
for (const server of servers) {
- const { total, data } = await server.videosCommand.listByAccount({ accountName: 'user1@localhost:' + servers[0].port, search: 'Kami' })
+ const { total, data } = await server.videos.listByAccount({ handle: 'user1@localhost:' + servers[0].port, search: 'Kami' })
expect(total).to.equal(1)
expect(data).to.be.an('array')
this.timeout(10_000)
for (const server of servers) {
- const body = await server.accountsCommand.list({ sort: '-createdAt' })
+ const body = await server.accounts.list({ sort: '-createdAt' })
const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port)
expect(accountDeleted).not.to.be.undefined
- const { data } = await server.channelsCommand.list()
+ const { data } = await server.channels.list()
const videoChannelDeleted = data.find(a => a.displayName === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port)
expect(videoChannelDeleted).not.to.be.undefined
}
- await servers[0].usersCommand.remove({ userId })
+ await servers[0].users.remove({ userId })
await waitJobs(servers)
for (const server of servers) {
- const body = await server.accountsCommand.list({ sort: '-createdAt' })
+ const body = await server.accounts.list({ sort: '-createdAt' })
const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port)
expect(accountDeleted).to.be.undefined
- const { data } = await server.channelsCommand.list()
+ const { data } = await server.channels.list()
const videoChannelDeleted = data.find(a => a.name === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port)
expect(videoChannelDeleted).to.be.undefined
}
it('Should not have actor files', async () => {
for (const server of servers) {
- await checkActorFilesWereRemoved(userAvatarFilename, server.internalServerNumber)
+ for (const userAvatarFilename of userAvatarFilenames) {
+ await checkActorFilesWereRemoved(userAvatarFilename, server.internalServerNumber)
+ }
}
})
it('Should not have video files', async () => {
for (const server of servers) {
- await checkVideoFilesWereRemoved(videoUUID, server)
+ await checkVideoFilesWereRemoved({ server, video: server.store.videoDetails })
}
})