X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers-multiple-servers.ts;h=006d6cdf0e17da82d395e476bac0bb935620bd15;hb=2f1548fda32c3ba9e53913270394eedfacd55986;hp=0483b9c3de07c7a1ed1b0be66ce904a362efec3b;hpb=f05a1c30c15d2ae35c11e241ca039a72eeb7d6ad;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 0483b9c3d..006d6cdf0 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -3,20 +3,35 @@ import * as chai from 'chai' import 'mocha' import { Account } from '../../../../shared/models/actors' -import { checkVideoFilesWereRemoved, createUser, doubleFollow, flushAndRunMultipleServers, removeUser, userLogin, wait } from '../../utils' -import { flushTests, getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index' -import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts' -import { setAccessTokensToServers } from '../../utils/users/login' +import { + checkVideoFilesWereRemoved, + createUser, + doubleFollow, + flushAndRunMultipleServers, + getAccountVideos, + getVideoChannelsList, + removeUser, + updateMyUser, + userLogin +} from '../../../../shared/utils' +import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/utils/index' +import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/utils/users/accounts' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' +import { User } from '../../../../shared/models/users' +import { VideoChannel } from '../../../../shared/models/videos' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect describe('Test users with multiple servers', function () { let servers: ServerInfo[] = [] - let user - let userUUID - let userId - let videoUUID - let userAccessToken + let user: User + let userAccountName: string + let userAccountUUID: string + let userVideoChannelUUID: string + let userId: number + let videoUUID: string + let userAccessToken: string before(async function () { this.timeout(120000) @@ -36,19 +51,68 @@ describe('Test users with multiple servers', function () { // The root user of server 1 is propagated to servers 2 and 3 await uploadVideo(servers[0].url, servers[0].accessToken, {}) - const user = { - username: 'user1', - password: 'password' + { + const user = { + username: 'user1', + password: 'password' + } + const res = await createUser(servers[ 0 ].url, servers[ 0 ].accessToken, user.username, user.password) + userId = res.body.user.id + userAccessToken = await userLogin(servers[ 0 ], user) } - const resUser = await createUser(servers[0].url, servers[0].accessToken, user.username, user.password) - userUUID = resUser.body.user.uuid - userId = resUser.body.user.id - userAccessToken = await userLogin(servers[0], user) - const resVideo = await uploadVideo(servers[0].url, userAccessToken, {}) - videoUUID = resVideo.body.uuid + { + const res = await getMyUserInformation(servers[0].url, userAccessToken) + const account: Account = res.body.account + userAccountName = account.name + '@' + account.host + userAccountUUID = account.uuid + } + + { + const res = await getMyUserInformation(servers[ 0 ].url, servers[ 0 ].accessToken) + const user: User = res.body + userVideoChannelUUID = user.videoChannels[0].uuid + } + + { + const resVideo = await uploadVideo(servers[ 0 ].url, userAccessToken, {}) + videoUUID = resVideo.body.video.uuid + } - await wait(5000) + await waitJobs(servers) + }) + + 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 + 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(10000) + + await updateMyUser({ + url: servers[0].url, + accessToken: servers[0].accessToken, + description: 'my super description updated' + }) + + const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) + user = res.body + expect(user.account.displayName).to.equal('my super display name') + expect(user.account.description).to.equal('my super description updated') + + await waitJobs(servers) }) it('Should be able to update my avatar', async function () { @@ -65,26 +129,43 @@ describe('Test users with multiple servers', function () { const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) user = res.body - const test = await testImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png') - expect(test).to.equal(true) + await testImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png') - await wait(5000) + await waitJobs(servers) }) - it('Should have updated my avatar on other servers too', async function () { + it('Should have updated my profile on other servers too', async function () { for (const server of servers) { const resAccounts = await getAccountsList(server.url, '-createdAt') const rootServer1List = resAccounts.body.data.find(a => a.name === 'root' && a.host === 'localhost:9001') as Account expect(rootServer1List).not.to.be.undefined - const resAccount = await getAccount(server.url, rootServer1List.id) + const resAccount = await getAccount(server.url, rootServer1List.name + '@' + rootServer1List.host) const rootServer1Get = resAccount.body as Account expect(rootServer1Get.name).to.equal('root') expect(rootServer1Get.host).to.equal('localhost:9001') + expect(rootServer1Get.displayName).to.equal('my super display name') + expect(rootServer1Get.description).to.equal('my super description updated') + + if (server.serverNumber === 1) { + expect(rootServer1Get.userId).to.be.a('number') + } else { + expect(rootServer1Get.userId).to.be.undefined + } - const test = await testImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png') - expect(test).to.equal(true) + await testImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png') + } + }) + + it('Should list account videos', async function () { + for (const server of servers) { + const res = await getAccountVideos(server.url, server.accessToken, userAccountName, 0, 5) + + 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) } }) @@ -94,25 +175,38 @@ describe('Test users with multiple servers', function () { for (const server of servers) { const resAccounts = await getAccountsList(server.url, '-createdAt') - const userServer1List = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account - expect(userServer1List).not.to.be.undefined + const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account + expect(accountDeleted).not.to.be.undefined + + const resVideoChannels = await getVideoChannelsList(server.url, 0, 10) + const videoChannelDeleted = resVideoChannels.body.data.find(a => { + return a.displayName === 'Main user1 channel' && a.host === 'localhost:9001' + }) as VideoChannel + expect(videoChannelDeleted).not.to.be.undefined } await removeUser(servers[0].url, userId, servers[0].accessToken) - await wait(5000) + await waitJobs(servers) for (const server of servers) { const resAccounts = await getAccountsList(server.url, '-createdAt') - const userServer1List = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account - expect(userServer1List).to.be.undefined + const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account + expect(accountDeleted).to.be.undefined + + const resVideoChannels = await getVideoChannelsList(server.url, 0, 10) + const videoChannelDeleted = resVideoChannels.body.data.find(a => { + return a.name === 'Main user1 channel' && a.host === 'localhost:9001' + }) as VideoChannel + expect(videoChannelDeleted).to.be.undefined } }) it('Should not have actor files', async () => { for (const server of servers) { - await checkActorFilesWereRemoved(userUUID, server.serverNumber) + await checkActorFilesWereRemoved(userAccountUUID, server.serverNumber) + await checkActorFilesWereRemoved(userVideoChannelUUID, server.serverNumber) } }) @@ -124,10 +218,5 @@ describe('Test users with multiple servers', function () { after(async function () { killallServers(servers) - - // Keep the logs if the test failed - if (this[ 'ok' ]) { - await flushTests() - } }) })