X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers-multiple-servers.ts;h=7914183188e6578f5cd354ce75faa2e6da82c3a1;hb=c25e8ce505b8e47532d3e703c923c15ac7c4574e;hp=a7f3aa8d35624e6cc062a640e8434a4f97985020;hpb=6b738c7a31591a83fdcd9c78b6b1f98e543c378b;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 a7f3aa8d3..791418318 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -4,7 +4,9 @@ import * as chai from 'chai' import 'mocha' import { Account } from '../../../../shared/models/actors' import { + checkTmpIsEmpty, checkVideoFilesWereRemoved, + cleanupTests, createUser, doubleFollow, flushAndRunMultipleServers, @@ -12,25 +14,24 @@ import { getVideoChannelsList, removeUser, updateMyUser, - 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' + userLogin +} from '../../../../shared/extra-utils' +import { getMyUserInformation, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/extra-utils/index' +import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/extra-utils/users/accounts' +import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login' import { User } from '../../../../shared/models/users' import { VideoChannel } from '../../../../shared/models/videos' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' const expect = chai.expect describe('Test users with multiple servers', function () { let servers: ServerInfo[] = [] let user: User - let userAccountUUID: string - let userVideoChannelUUID: string let userId: number let videoUUID: string let userAccessToken: string + let userAvatarFilename: string before(async function () { this.timeout(120000) @@ -55,25 +56,40 @@ describe('Test users with multiple servers', function () { username: 'user1', password: 'password' } - const res = await createUser(servers[ 0 ].url, servers[ 0 ].accessToken, user.username, user.password) - userAccountUUID = res.body.user.account.uuid + 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 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 + + const account: Account = user.account + expect(user.account.displayName).to.equal('my super display name') + + await waitJobs(servers) }) it('Should be able to update my description', async function () { @@ -87,9 +103,10 @@ describe('Test users with multiple servers', function () { 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 wait(5000) + await waitJobs(servers) }) it('Should be able to update my avatar', async function () { @@ -106,31 +123,40 @@ describe('Test users with multiple servers', function () { const res = await getMyUserInformation(servers[0].url, servers[0].accessToken) user = res.body - await testImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png') + userAvatarFilename = user.account.avatar.path - await wait(5000) + await testImage(servers[0].url, 'avatar2-resized', userAvatarFilename, '.png') + + await waitJobs(servers) }) - it('Should have updated my avatar and my description 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 + const rootServer1List = resAccounts.body.data.find(a => a.name === 'root' && a.host === 'localhost:' + servers[0].port) 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.host).to.equal('localhost:' + servers[0].port) + 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 + } + 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, userAccountUUID, 0, 5) + const res = await getAccountVideos(server.url, server.accessToken, 'user1@localhost:' + servers[0].port, 0, 5) expect(res.body.total).to.equal(1) expect(res.body.data).to.be.an('array') @@ -145,29 +171,29 @@ describe('Test users with multiple servers', function () { for (const server of servers) { const resAccounts = await getAccountsList(server.url, '-createdAt') - const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account + const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port) 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 === 'Default user1 channel' && a.host === 'localhost:9001' + return a.displayName === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port }) 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 accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account + const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port) 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 === 'Default user1 channel' && a.host === 'localhost:9001' + return a.name === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port }) as VideoChannel expect(videoChannelDeleted).to.be.undefined } @@ -175,23 +201,23 @@ describe('Test users with multiple servers', function () { it('Should not have actor files', async () => { for (const server of servers) { - await checkActorFilesWereRemoved(userAccountUUID, server.serverNumber) - await checkActorFilesWereRemoved(userVideoChannelUUID, server.serverNumber) + await checkActorFilesWereRemoved(userAvatarFilename, server.internalServerNumber) } }) it('Should not have video files', async () => { for (const server of servers) { - await checkVideoFilesWereRemoved(videoUUID, server.serverNumber) + await checkVideoFilesWereRemoved(videoUUID, server.internalServerNumber) } }) - after(async function () { - killallServers(servers) - - // Keep the logs if the test failed - if (this[ 'ok' ]) { - await flushTests() + it('Should have an empty tmp directory', async function () { + for (const server of servers) { + await checkTmpIsEmpty(server) } }) + + after(async function () { + await cleanupTests(servers) + }) })