From 94148c9028829b5576a5dcbfba2c7fb9cf6443d3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 27 Jul 2020 11:40:30 +0200 Subject: Add abuse messages management in my account --- server/tests/api/check-params/abuses.ts | 52 +++++++++++++++++++++++++++++---- server/tests/api/moderation/abuses.ts | 19 ++++++++---- 2 files changed, 61 insertions(+), 10 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts index 5e1d66c25..0ef8f6cac 100644 --- a/server/tests/api/check-params/abuses.ts +++ b/server/tests/api/check-params/abuses.ts @@ -3,21 +3,26 @@ import 'mocha' import { AbuseCreate, AbuseState } from '@shared/models' import { + addAbuseMessage, cleanupTests, createUser, deleteAbuse, + deleteAbuseMessage, + doubleFollow, flushAndRunServer, + generateUserAccessToken, + getAdminAbusesList, + getVideoIdFromUUID, + listAbuseMessages, makeGetRequest, makePostBodyRequest, + reportAbuse, ServerInfo, setAccessTokensToServers, updateAbuse, uploadVideo, userLogin, - generateUserAccessToken, - addAbuseMessage, - listAbuseMessages, - deleteAbuseMessage + waitJobs } from '../../../../shared/extra-utils' import { checkBadCountPagination, @@ -29,6 +34,7 @@ describe('Test abuses API validators', function () { const basePath = '/api/v1/abuses/' let server: ServerInfo + let userAccessToken = '' let userAccessToken2 = '' let abuseId: number @@ -321,7 +327,7 @@ describe('Test abuses API validators', function () { }) }) - describe('When listing abuse message', function () { + describe('When listing abuse messages', function () { it('Should fail with an invalid abuse id', async function () { await listAbuseMessages(server.url, userAccessToken, 888, 404) @@ -382,7 +388,43 @@ describe('Test abuses API validators', function () { }) }) + describe('When trying to manage messages of a remote abuse', function () { + let remoteAbuseId: number + let anotherServer: ServerInfo + + before(async function () { + this.timeout(20000) + + anotherServer = await flushAndRunServer(2) + await setAccessTokensToServers([ anotherServer ]) + + await doubleFollow(anotherServer, server) + + const server2VideoId = await getVideoIdFromUUID(anotherServer.url, server.video.uuid) + await reportAbuse({ + url: anotherServer.url, + token: anotherServer.accessToken, + reason: 'remote server', + videoId: server2VideoId + }) + + await waitJobs([ server, anotherServer ]) + + const res = await getAdminAbusesList({ url: server.url, token: server.accessToken, sort: '-createdAt' }) + remoteAbuseId = res.body.data[0].id + }) + + it('Should fail when listing abuse messages of a remote abuse', async function () { + await listAbuseMessages(server.url, server.accessToken, remoteAbuseId, 400) + }) + + it('Should fail when creating abuse message of a remote abuse', async function () { + await addAbuseMessage(server.url, server.accessToken, remoteAbuseId, 'message', 400) + }) + }) + after(async function () { await cleanupTests([ server ]) }) }) + diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts index 601125fdf..fb765e7e3 100644 --- a/server/tests/api/moderation/abuses.ts +++ b/server/tests/api/moderation/abuses.ts @@ -2,12 +2,23 @@ import 'mocha' import * as chai from 'chai' -import { AbuseFilter, AbusePredefinedReasonsString, AbuseState, Account, AdminAbuse, UserAbuse, VideoComment, AbuseMessage } from '@shared/models' import { + AbuseFilter, + AbuseMessage, + AbusePredefinedReasonsString, + AbuseState, + Account, + AdminAbuse, + UserAbuse, + VideoComment +} from '@shared/models' +import { + addAbuseMessage, addVideoCommentThread, cleanupTests, createUser, deleteAbuse, + deleteAbuseMessage, deleteVideoComment, flushAndRunMultipleServers, generateUserAccessToken, @@ -18,6 +29,7 @@ import { getVideoIdFromUUID, getVideosList, immutableAssign, + listAbuseMessages, removeUser, removeVideo, reportAbuse, @@ -26,10 +38,7 @@ import { updateAbuse, uploadVideo, uploadVideoAndGetId, - userLogin, - addAbuseMessage, - listAbuseMessages, - deleteAbuseMessage + userLogin } from '../../../../shared/extra-utils/index' import { doubleFollow } from '../../../../shared/extra-utils/server/follows' import { waitJobs } from '../../../../shared/extra-utils/server/jobs' -- cgit v1.2.3