X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers-multiple-servers.ts;h=7b650cb8fd8e707d98f7d1eb91f071c1a603597f;hb=6c5065a011b099618681a37bd77eaa7bd3db752e;hp=d8699db17b274986d2137cb3c4bbc6fbb7952ba7;hpb=be0f59b4eec3c2c4dcd151e2b174be39dff1568e;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 d8699db17..7b650cb8f 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -1,40 +1,41 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import * as chai from 'chai' import 'mocha' -import { Account } from '../../../../shared/models/actors' +import * as chai from 'chai' import { + checkActorFilesWereRemoved, + checkTmpIsEmpty, checkVideoFilesWereRemoved, + cleanupTests, createUser, doubleFollow, flushAndRunMultipleServers, getAccountVideos, - getVideoChannelsList, + getMyUserInformation, removeUser, + ServerInfo, + setAccessTokensToServers, + testImage, + updateMyAvatar, updateMyUser, - userLogin -} from '../../utils' -import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index' -import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts' -import { setAccessTokensToServers } from '../../utils/users/login' -import { User } from '../../../../shared/models/users' -import { VideoChannel } from '../../../../shared/models/videos' -import { waitJobs } from '../../utils/server/jobs' + uploadVideo, + userLogin, + waitJobs +} from '@shared/extra-utils' +import { User } from '@shared/models' const expect = chai.expect describe('Test users with multiple servers', function () { let servers: ServerInfo[] = [] let user: User - let userAccountName: string - let userAccountUUID: string - let userVideoChannelUUID: string let userId: number let videoUUID: string let userAccessToken: string + let userAvatarFilename: string before(async function () { - this.timeout(120000) + this.timeout(120_000) servers = await flushAndRunMultipleServers(3) @@ -56,26 +57,18 @@ 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) + 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, 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 + userAccessToken = await userLogin(servers[0], user) } { - const resVideo = await uploadVideo(servers[ 0 ].url, userAccessToken, {}) + const resVideo = await uploadVideo(servers[0].url, userAccessToken, {}) videoUUID = resVideo.body.video.uuid } @@ -93,13 +86,14 @@ 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') await waitJobs(servers) }) it('Should be able to update my description', async function () { - this.timeout(10000) + this.timeout(10_000) await updateMyUser({ url: servers[0].url, @@ -116,7 +110,7 @@ describe('Test users with multiple servers', function () { }) it('Should be able to update my avatar', async function () { - this.timeout(10000) + this.timeout(10_000) const fixture = 'avatar2.png' @@ -129,38 +123,45 @@ 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 testImage(servers[0].url, 'avatar2-resized', userAvatarFilename, '.png') await waitJobs(servers) }) it('Should have updated my profile on other servers too', async function () { + let createdAt: string | Date + for (const server of servers) { - const resAccounts = await getAccountsList(server.url, '-createdAt') + const body = await server.accountsCommand.list({ sort: '-createdAt' }) + + const resList = body.data.find(a => a.name === 'root' && a.host === 'localhost:' + servers[0].port) + expect(resList).not.to.be.undefined - const rootServer1List = resAccounts.body.data.find(a => a.name === 'root' && a.host === 'localhost:9001') as Account - expect(rootServer1List).not.to.be.undefined + const account = await server.accountsCommand.get({ accountName: resList.name + '@' + resList.host }) - 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 (!createdAt) createdAt = account.createdAt + + expect(account.name).to.equal('root') + expect(account.host).to.equal('localhost:' + servers[0].port) + expect(account.displayName).to.equal('my super display name') + expect(account.description).to.equal('my super description updated') + expect(createdAt).to.equal(account.createdAt) if (server.serverNumber === 1) { - expect(rootServer1Get.userId).to.be.a('number') + expect(account.userId).to.be.a('number') } else { - expect(rootServer1Get.userId).to.be.undefined + expect(account.userId).to.be.undefined } - await testImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png') + await testImage(server.url, 'avatar2-resized', account.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) + 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') @@ -169,19 +170,36 @@ describe('Test users with multiple servers', function () { } }) + it('Should search through account videos', async function () { + this.timeout(10_000) + + const resVideo = await uploadVideo(servers[0].url, userAccessToken, { 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) + } + }) + it('Should remove the user', async function () { - this.timeout(10000) + this.timeout(10_000) for (const server of servers) { - const resAccounts = await getAccountsList(server.url, '-createdAt') + const body = await server.accountsCommand.list({ sort: '-createdAt' }) - const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account + const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port) 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 + const { data } = await server.channelsCommand.list() + const videoChannelDeleted = data.find(a => a.displayName === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port) expect(videoChannelDeleted).not.to.be.undefined } @@ -190,33 +208,36 @@ describe('Test users with multiple servers', function () { await waitJobs(servers) for (const server of servers) { - const resAccounts = await getAccountsList(server.url, '-createdAt') + const body = await server.accountsCommand.list({ sort: '-createdAt' }) - const accountDeleted = resAccounts.body.data.find(a => a.name === 'user1' && a.host === 'localhost:9001') as Account + const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port) 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 + const { data } = await server.channelsCommand.list() + const videoChannelDeleted = data.find(a => a.name === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port) expect(videoChannelDeleted).to.be.undefined } }) 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) + } + }) + + it('Should have an empty tmp directory', async function () { + for (const server of servers) { + await checkTmpIsEmpty(server) } }) after(async function () { - killallServers(servers) + await cleanupTests(servers) }) })