checkActorFilesWereRemoved,
checkTmpIsEmpty,
checkVideoFilesWereRemoved,
+ saveVideoInServers,
+ testImage
+} from '@server/tests/shared'
+import { MyUser } from '@shared/models'
+import {
cleanupTests,
createMultipleServers,
doubleFollow,
PeerTubeServer,
- saveVideoInServers,
setAccessTokensToServers,
- testImage,
+ setDefaultChannelAvatar,
waitJobs
-} from '@shared/extra-utils'
-import { MyUser } from '@shared/models'
+} from '@shared/server-commands'
const expect = chai.expect
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])
const { uuid } = await servers[0].videos.upload({ token: userAccessToken })
videoUUID = uuid
+ await waitJobs(servers)
+
await saveVideoInServers(servers, videoUUID)
}
-
- await waitJobs(servers)
})
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 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)
+ }
}
})