X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers-multiple-servers.ts;h=8d94362479ac7265bd087d8de99bdbf1c713d1c4;hb=261dac403a6380ea46f4f0bee8d50c6f661fbdfa;hp=7b650cb8fd8e707d98f7d1eb91f071c1a603597f;hpb=6c5065a011b099618681a37bd77eaa7bd3db752e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts index 7b650cb8f..8d9436247 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -1,46 +1,42 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import 'mocha' -import * as chai from 'chai' +import { expect } from 'chai' import { checkActorFilesWereRemoved, checkTmpIsEmpty, checkVideoFilesWereRemoved, + saveVideoInServers, + testImage +} from '@server/tests/shared' +import { MyUser } from '@shared/models' +import { cleanupTests, - createUser, + createMultipleServers, doubleFollow, - flushAndRunMultipleServers, - getAccountVideos, - getMyUserInformation, - removeUser, - ServerInfo, + PeerTubeServer, setAccessTokensToServers, - testImage, - updateMyAvatar, - updateMyUser, - uploadVideo, - userLogin, + setDefaultChannelAvatar, waitJobs -} from '@shared/extra-utils' -import { User } from '@shared/models' - -const expect = chai.expect +} from '@shared/server-commands' 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]) @@ -50,43 +46,31 @@ describe('Test users with multiple servers', function () { await doubleFollow(servers[1], servers[2]) // The root user of server 1 is propagated to servers 2 and 3 - await uploadVideo(servers[0].url, servers[0].accessToken, {}) + await servers[0].videos.upload() { - const user = { - username: 'user1', - password: 'password' - } - const res = await createUser({ - url: servers[0].url, - accessToken: servers[0].accessToken, - username: user.username, - password: user.password - }) - userId = res.body.user.id - userAccessToken = await userLogin(servers[0], user) + const username = 'user1' + const created = await servers[0].users.create({ username }) + userId = created.id + userAccessToken = await servers[0].login.getAccessToken(username) } { - const resVideo = await uploadVideo(servers[0].url, userAccessToken, {}) - videoUUID = resVideo.body.video.uuid - } + 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 updateMyUser({ - url: servers[0].url, - accessToken: servers[0].accessToken, - displayName: 'my super display name' - }) - - const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) - user = res.body + await servers[0].users.updateMe({ displayName: 'my super display name' }) + user = await servers[0].users.getMyInfo() expect(user.account.displayName).to.equal('my super display name') await waitJobs(servers) @@ -95,14 +79,9 @@ describe('Test users with multiple servers', function () { it('Should be able to update my description', async function () { this.timeout(10_000) - await updateMyUser({ - url: servers[0].url, - accessToken: servers[0].accessToken, - description: 'my super description updated' - }) + await servers[0].users.updateMe({ description: 'my super description updated' }) - const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) - user = res.body + 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') @@ -114,18 +93,14 @@ describe('Test users with multiple servers', function () { const fixture = 'avatar2.png' - await updateMyAvatar({ - url: servers[0].url, - accessToken: servers[0].accessToken, - fixture - }) - - const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) - user = res.body + await servers[0].users.updateMyAvatar({ fixture }) - 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) }) @@ -134,17 +109,17 @@ describe('Test users with multiple servers', function () { 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) + const resList = body.data.find(a => a.name === 'root' && a.host === servers[0].host) 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.name).to.equal('root') - expect(account.host).to.equal('localhost:' + servers[0].port) + expect(account.host).to.equal(servers[0].host) expect(account.displayName).to.equal('my super display name') expect(account.description).to.equal('my super description updated') expect(createdAt).to.equal(account.createdAt) @@ -155,37 +130,35 @@ describe('Test users with multiple servers', function () { 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 res = await getAccountVideos(server.url, server.accessToken, 'user1@localhost:' + servers[0].port, 0, 5) + const { total, data } = await server.videos.listByAccount({ handle: 'user1@' + servers[0].host }) - 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].uuid).to.equal(videoUUID) + expect(total).to.equal(1) + expect(data).to.be.an('array') + expect(data).to.have.lengthOf(1) + expect(data[0].uuid).to.equal(videoUUID) } }) it('Should search through account videos', async function () { - this.timeout(10_000) - - const resVideo = await uploadVideo(servers[0].url, userAccessToken, { 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 res = await getAccountVideos(server.url, server.accessToken, 'user1@localhost:' + servers[0].port, 0, 5, undefined, { - search: 'Kami' - }) - - 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].uuid).to.equal(resVideo.body.video.uuid) + const { total, data } = await server.videos.listByAccount({ handle: 'user1@' + servers[0].host, search: 'Kami' }) + + expect(total).to.equal(1) + expect(data).to.be.an('array') + expect(data).to.have.lengthOf(1) + expect(data[0].uuid).to.equal(created.uuid) } }) @@ -193,41 +166,43 @@ describe('Test users with multiple servers', function () { 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) + const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === servers[0].host) expect(accountDeleted).not.to.be.undefined - const { data } = await server.channelsCommand.list() - const videoChannelDeleted = data.find(a => a.displayName === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port) + const { data } = await server.channels.list() + const videoChannelDeleted = data.find(a => a.displayName === 'Main user1 channel' && a.host === servers[0].host) expect(videoChannelDeleted).not.to.be.undefined } - await removeUser(servers[0].url, userId, servers[0].accessToken) + 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) + const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === servers[0].host) expect(accountDeleted).to.be.undefined - const { data } = await server.channelsCommand.list() - const videoChannelDeleted = data.find(a => a.name === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port) + const { data } = await server.channels.list() + const videoChannelDeleted = data.find(a => a.name === 'Main user1 channel' && a.host === servers[0].host) 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) + } } }) it('Should not have video files', async () => { for (const server of servers) { - await checkVideoFilesWereRemoved(videoUUID, server) + await checkVideoFilesWereRemoved({ server, video: server.store.videoDetails }) } })