checkActorFilesWereRemoved,
checkTmpIsEmpty,
checkVideoFilesWereRemoved,
+ saveVideoInServers,
+ testImage
+} from '@server/tests/shared'
+import { MyUser } from '@shared/models'
+import {
cleanupTests,
- doubleFollow,
createMultipleServers,
+ doubleFollow,
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: PeerTubeServer[] = []
- let user: User
+
+ 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)
// 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 servers[0].videos.upload()
{
- const user = {
- username: 'user1',
- password: 'password'
- }
- const created = await servers[0].users.create(user)
+ const username = 'user1'
+ const created = await servers[0].users.create({ username })
userId = created.id
- userAccessToken = await servers[0].login.getAccessToken(user)
+ userAccessToken = await servers[0].login.getAccessToken(username)
}
{
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 () {
await servers[0].users.updateMyAvatar({ fixture })
user = await servers[0].users.getMyInfo()
- userAvatarFilename = user.account.avatar.path
+ 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)
})
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.videos.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')
await waitJobs(servers)
for (const server of servers) {
- const { total, data } = await server.videos.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')
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 })
}
})