X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-comments.ts;h=06e4ff9c822b3dab4244219c2aa2dc334e60b750;hb=fe98765624cdd6695739bda719fcb726b71c2b2a;hp=50224ee473b1ab6216b36caa368e1df8c6d580f8;hpb=210feb6cc484a6c5c63c98f770de34e223f944cb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index 50224ee47..06e4ff9c8 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts @@ -3,15 +3,15 @@ import * as chai from 'chai' import 'mocha' import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' -import { testImage } from '../../../../shared/extra-utils' +import { cleanupTests, testImage } from '../../../../shared/extra-utils' import { dateIsValid, - flushTests, - killallServers, flushAndRunServer, ServerInfo, setAccessTokensToServers, updateMyAvatar, + getAccessToken, + createUser, uploadVideo } from '../../../../shared/extra-utils/index' import { @@ -31,6 +31,8 @@ describe('Test video comments', function () { let threadId let replyToDeleteId: number + let userAccessTokenServer1: string + before(async function () { this.timeout(30000) @@ -47,6 +49,14 @@ describe('Test video comments', function () { accessToken: server.accessToken, fixture: 'avatar.png' }) + + await createUser({ + url: server.url, + accessToken: server.accessToken, + username: 'user1', + password: 'password' + }) + userAccessTokenServer1 = await getAccessToken(server.url, 'user1', 'password') }) it('Should not have threads on this video', async function () { @@ -68,9 +78,10 @@ describe('Test video comments', function () { expect(comment.videoId).to.equal(videoId) 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.account.host).to.equal('localhost:' + server.port) + expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root') expect(comment.totalReplies).to.equal(0) + expect(comment.totalRepliesFromVideoAuthor).to.equal(0) expect(dateIsValid(comment.createdAt as string)).to.be.true expect(dateIsValid(comment.updatedAt as string)).to.be.true }) @@ -88,11 +99,12 @@ describe('Test video comments', function () { expect(comment.videoId).to.equal(videoId) 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.host).to.equal('localhost:' + server.port) await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png') expect(comment.totalReplies).to.equal(0) + expect(comment.totalRepliesFromVideoAuthor).to.equal(0) expect(dateIsValid(comment.createdAt as string)).to.be.true expect(dateIsValid(comment.updatedAt as string)).to.be.true @@ -174,7 +186,7 @@ describe('Test video comments', function () { const tree: VideoCommentThreadTree = res.body expect(tree.comment.text).equal('my super first comment') - expect(tree.children).to.have.lengthOf(1) + expect(tree.children).to.have.lengthOf(2) const firstChild = tree.children[0] expect(firstChild.comment.text).to.equal('my super answer to thread 1') @@ -183,23 +195,53 @@ describe('Test video comments', function () { 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) + + const deletedChildOfFirstChild = tree.children[1] + expect(deletedChildOfFirstChild.comment.text).to.equal('') + expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true + expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null + expect(deletedChildOfFirstChild.comment.account).to.be.null + expect(deletedChildOfFirstChild.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.total).to.equal(3) expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(2) + expect(res.body.data).to.have.lengthOf(3) - 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[0].text).to.equal('') + expect(res.body.data[0].isDeleted).to.be.true + expect(res.body.data[0].deletedAt).to.not.be.null + expect(res.body.data[0].account).to.be.null + expect(res.body.data[0].totalReplies).to.equal(3) + expect(res.body.data[1].text).to.equal('super thread 2') expect(res.body.data[1].totalReplies).to.equal(0) + expect(res.body.data[2].text).to.equal('super thread 3') + expect(res.body.data[2].totalReplies).to.equal(0) + }) + + it('Should count replies from the video author correctly', async function () { + const text = 'my super first comment' + await addVideoCommentThread(server.url, server.accessToken, videoUUID, text) + let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + const comment: VideoComment = res.body.data[0] + const threadId2 = comment.threadId + + const text2 = 'a first answer to thread 4 by a third party' + await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2) + + const text3 = 'my second answer to thread 4' + await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3) + + res = await getVideoThreadComments(server.url, videoUUID, threadId2) + const tree: VideoCommentThreadTree = res.body + expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1) }) - after(function () { - killallServers([ server ]) + after(async function () { + await cleanupTests([ server ]) }) })