From 265ba139ebf56bbdc1c65f6ea4f367774c691fc0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 3 Jan 2018 16:38:50 +0100 Subject: Send account activitypub update events --- server/tests/api/check-params/accounts.ts | 51 ++++++++++++++ server/tests/api/check-params/index.ts | 1 + server/tests/api/fixtures/avatar2-resized.png | Bin 0 -> 2350 bytes server/tests/api/fixtures/avatar2.png | Bin 0 -> 4850 bytes server/tests/api/index-slow.ts | 1 + server/tests/api/users/users-multiple-servers.ts | 85 +++++++++++++++++++++++ 6 files changed, 138 insertions(+) create mode 100644 server/tests/api/check-params/accounts.ts create mode 100644 server/tests/api/fixtures/avatar2-resized.png create mode 100644 server/tests/api/fixtures/avatar2.png create mode 100644 server/tests/api/users/users-multiple-servers.ts (limited to 'server/tests/api') diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts new file mode 100644 index 000000000..351228754 --- /dev/null +++ b/server/tests/api/check-params/accounts.ts @@ -0,0 +1,51 @@ +/* tslint:disable:no-unused-expression */ + +import 'mocha' + +import { flushTests, killallServers, runServer, ServerInfo } from '../../utils' +import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +import { getAccount } from '../../utils/users/accounts' + +describe('Test users API validators', function () { + const path = '/api/v1/accounts/' + let server: ServerInfo + + // --------------------------------------------------------------- + + before(async function () { + this.timeout(20000) + + await flushTests() + + server = await runServer(1) + }) + + describe('When listing accounts', function () { + it('Should fail with a bad start pagination', async function () { + await checkBadStartPagination(server.url, path, server.accessToken) + }) + + it('Should fail with a bad count pagination', async function () { + await checkBadCountPagination(server.url, path, server.accessToken) + }) + + it('Should fail with an incorrect sort', async function () { + await checkBadSortPagination(server.url, path, server.accessToken) + }) + }) + + describe('When getting an account', function () { + it('Should return 404 with a non existing id', async function () { + await getAccount(server.url, 4545454, 404) + }) + }) + + after(async function () { + killallServers([ server ]) + + // Keep the logs if the test failed + if (this['ok']) { + await flushTests() + } + }) +}) diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts index ab0aa1580..4c3b372f5 100644 --- a/server/tests/api/check-params/index.ts +++ b/server/tests/api/check-params/index.ts @@ -1,4 +1,5 @@ // Order of the tests we want to execute +import './accounts' import './follows' import './jobs' import './services' diff --git a/server/tests/api/fixtures/avatar2-resized.png b/server/tests/api/fixtures/avatar2-resized.png new file mode 100644 index 000000000..a2e2613bf Binary files /dev/null and b/server/tests/api/fixtures/avatar2-resized.png differ diff --git a/server/tests/api/fixtures/avatar2.png b/server/tests/api/fixtures/avatar2.png new file mode 100644 index 000000000..dae702190 Binary files /dev/null and b/server/tests/api/fixtures/avatar2.png differ diff --git a/server/tests/api/index-slow.ts b/server/tests/api/index-slow.ts index 23b6526c7..fe86fc018 100644 --- a/server/tests/api/index-slow.ts +++ b/server/tests/api/index-slow.ts @@ -5,3 +5,4 @@ import './videos/multiple-servers' import './server/follows' import './server/jobs' import './videos/video-comments' +import './users/users-multiple-servers' diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts new file mode 100644 index 000000000..1c7f011a8 --- /dev/null +++ b/server/tests/api/users/users-multiple-servers.ts @@ -0,0 +1,85 @@ +/* tslint:disable:no-unused-expression */ + +import * as chai from 'chai' +import 'mocha' +import { Account } from '../../../../shared/models/actors' +import { doubleFollow, flushAndRunMultipleServers, wait } from '../../utils' +import { + flushTests, getMyUserInformation, killallServers, ServerInfo, testVideoImage, updateMyAvatar, + uploadVideo +} from '../../utils/index' +import { getAccount, getAccountsList } from '../../utils/users/accounts' +import { setAccessTokensToServers } from '../../utils/users/login' + +const expect = chai.expect + +describe('Test users with multiple servers', function () { + let servers: ServerInfo[] = [] + + before(async function () { + this.timeout(120000) + + servers = await flushAndRunMultipleServers(3) + + // Get the access tokens + await setAccessTokensToServers(servers) + + // Server 1 and server 2 follow each other + await doubleFollow(servers[0], servers[1]) + // Server 1 and server 3 follow each other + await doubleFollow(servers[0], servers[2]) + // Server 2 and server 3 follow each other + 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 wait(5000) + }) + + it('Should be able to update my avatar', async function () { + this.timeout(10000) + + 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) + const user = res.body + + const test = await testVideoImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png') + expect(test).to.equal(true) + + await wait(5000) + }) + + it('Should have updated my avatar 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 rootServer1Get = resAccount.body as Account + expect(rootServer1Get.name).to.equal('root') + expect(rootServer1Get.host).to.equal('localhost:9001') + + const test = await testVideoImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png') + expect(test).to.equal(true) + } + }) + + after(async function () { + killallServers(servers) + + // Keep the logs if the test failed + if (this[ 'ok' ]) { + await flushTests() + } + }) +}) -- cgit v1.2.3