From 4cb6d4578893db310297d7e118ce2fb7ecb952a3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 4 Jan 2018 11:19:16 +0100 Subject: Add ability to delete comments --- server/tests/api/check-params/video-comments.ts | 39 +++++++++++++++++++++++-- server/tests/api/videos/multiple-servers.ts | 33 ++++++++++++++++++++- server/tests/api/videos/video-comments.ts | 38 +++++++++++++++++++++++- server/tests/utils/videos/video-comments.ts | 21 ++++++++++++- 4 files changed, 126 insertions(+), 5 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts index c11660d07..9190054da 100644 --- a/server/tests/api/check-params/video-comments.ts +++ b/server/tests/api/check-params/video-comments.ts @@ -3,8 +3,9 @@ import * as chai from 'chai' import 'mocha' import { - flushTests, killallServers, makeGetRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, - uploadVideo + createUser, + flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, + uploadVideo, userLogin } from '../../utils' import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' import { addVideoCommentThread } from '../../utils/videos/video-comments' @@ -16,6 +17,7 @@ describe('Test video comments API validator', function () { let pathComment: string let server: ServerInfo let videoUUID: string + let userAccessToken: string let commentId: number // --------------------------------------------------------------- @@ -40,6 +42,15 @@ describe('Test video comments API validator', function () { commentId = res.body.comment.id pathComment = '/api/v1/videos/' + videoUUID + '/comments/' + commentId } + + { + const user = { + username: 'user1', + password: 'my super password' + } + await createUser(server.url, server.accessToken, user.username, user.password) + userAccessToken = await userLogin(server, user) + } }) describe('When listing video comment threads', function () { @@ -185,6 +196,30 @@ describe('Test video comments API validator', function () { }) }) + describe('When removing video comments', function () { + it('Should fail with a non authenticated user', async function () { + await makeDeleteRequest({ url: server.url, path: pathComment, token: 'none', statusCodeExpected: 401 }) + }) + + it('Should fail with another user', async function () { + await makeDeleteRequest({ url: server.url, path: pathComment, token: userAccessToken, statusCodeExpected: 403 }) + }) + + it('Should fail with an incorrect video', async function () { + const path = '/api/v1/videos/ba708d62-e3d7-45d9-9d73-41b9097cc02d/comments/' + commentId + await makeDeleteRequest({ url: server.url, path, token: server.accessToken, statusCodeExpected: 404 }) + }) + + it('Should fail with an incorrect comment', async function () { + const path = '/api/v1/videos/' + videoUUID + '/comments/124' + await makeDeleteRequest({ url: server.url, path, token: server.accessToken, statusCodeExpected: 404 }) + }) + + it('Should succeed with the correct parameters', async function () { + await makeDeleteRequest({ url: server.url, path: pathComment, token: server.accessToken, statusCodeExpected: 204 }) + }) + }) + describe('When a video has comments disabled', function () { before(async function () { const res = await uploadVideo(server.url, server.accessToken, { commentsEnabled: false }) diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index b6dfe0d1b..6712829d4 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -13,7 +13,7 @@ import { updateVideo, uploadVideo, userLogin, viewVideo, wait, webtorrentAdd } from '../../utils' import { - addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, + addVideoCommentReply, addVideoCommentThread, deleteVideoComment, getVideoCommentThreads, getVideoThreadComments } from '../../utils/videos/video-comments' @@ -738,6 +738,37 @@ describe('Test multiple servers', function () { } }) + it('Should delete the thread comments', async function () { + this.timeout(10000) + + const res1 = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5) + const threadId = res1.body.data.find(c => c.text === 'my super first comment').id + await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId) + + await wait(5000) + }) + + it('Should have the thread comments deleted on other servers too', async function () { + for (const server of servers) { + const res = await getVideoCommentThreads(server.url, videoUUID, 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) + + { + const comment: VideoComment = res.body.data[0] + expect(comment).to.not.be.undefined + expect(comment.inReplyToCommentId).to.be.null + expect(comment.account.name).to.equal('root') + expect(comment.account.host).to.equal('localhost:9003') + expect(comment.totalReplies).to.equal(0) + expect(dateIsValid(comment.createdAt as string)).to.be.true + expect(dateIsValid(comment.updatedAt as string)).to.be.true + } + } + }) + it('Should disable comments', async function () { this.timeout(20000) diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index 604a3027d..18d484ccf 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts @@ -9,7 +9,7 @@ import { uploadVideo } from '../../utils/index' import { - addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, + addVideoCommentReply, addVideoCommentThread, deleteVideoComment, getVideoCommentThreads, getVideoThreadComments } from '../../utils/videos/video-comments' @@ -20,6 +20,7 @@ describe('Test video comments', function () { let videoId let videoUUID let threadId + let replyToDeleteId: number before(async function () { this.timeout(10000) @@ -61,6 +62,7 @@ describe('Test video comments', function () { expect(comment.id).to.equal(comment.threadId) expect(comment.account.name).to.equal('root') expect(comment.account.host).to.equal('localhost:9001') + expect(comment.account.url).to.equal('http://localhost:9001/accounts/root') expect(comment.totalReplies).to.equal(0) expect(dateIsValid(comment.createdAt as string)).to.be.true expect(dateIsValid(comment.updatedAt as string)).to.be.true @@ -132,6 +134,8 @@ describe('Test video comments', function () { const secondChild = tree.children[1] expect(secondChild.comment.text).to.equal('my second answer to thread 1') expect(secondChild.children).to.have.lengthOf(0) + + replyToDeleteId = secondChild.comment.id }) it('Should create other threads', async function () { @@ -157,6 +161,38 @@ describe('Test video comments', function () { expect(res.body.data[2].totalReplies).to.equal(0) }) + it('Should delete a reply', async function () { + await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId) + + const res = await getVideoThreadComments(server.url, videoUUID, threadId) + + const tree: VideoCommentThreadTree = res.body + expect(tree.comment.text).equal('my super first comment') + expect(tree.children).to.have.lengthOf(1) + + const firstChild = tree.children[0] + expect(firstChild.comment.text).to.equal('my super answer to thread 1') + expect(firstChild.children).to.have.lengthOf(1) + + const childOfFirstChild = firstChild.children[0] + expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1') + expect(childOfFirstChild.children).to.have.lengthOf(0) + }) + + it('Should delete a complete thread', async function () { + await deleteVideoComment(server.url, server.accessToken, videoId, threadId) + + const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt') + expect(res.body.total).to.equal(2) + expect(res.body.data).to.be.an('array') + expect(res.body.data).to.have.lengthOf(2) + + expect(res.body.data[0].text).to.equal('super thread 2') + expect(res.body.data[0].totalReplies).to.equal(0) + expect(res.body.data[1].text).to.equal('super thread 3') + expect(res.body.data[1].totalReplies).to.equal(0) + }) + after(async function () { killallServers([ server ]) diff --git a/server/tests/utils/videos/video-comments.ts b/server/tests/utils/videos/video-comments.ts index 878147049..1b9ee452e 100644 --- a/server/tests/utils/videos/video-comments.ts +++ b/server/tests/utils/videos/video-comments.ts @@ -1,4 +1,5 @@ import * as request from 'supertest' +import { makeDeleteRequest } from '../' function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string) { const path = '/api/v1/videos/' + videoId + '/comment-threads' @@ -54,11 +55,29 @@ function addVideoCommentReply ( .expect(expectedStatus) } +function deleteVideoComment ( + url: string, + token: string, + videoId: number | string, + commentId: number, + statusCodeExpected = 204 +) { + const path = '/api/v1/videos/' + videoId + '/comments/' + commentId + + return makeDeleteRequest({ + url, + path, + token, + statusCodeExpected + }) +} + // --------------------------------------------------------------------------- export { getVideoCommentThreads, getVideoThreadComments, addVideoCommentThread, - addVideoCommentReply + addVideoCommentReply, + deleteVideoComment } -- cgit v1.2.3