diff options
Diffstat (limited to 'server/tests/api/activitypub')
-rw-r--r-- | server/tests/api/activitypub/cleaner.ts | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/server/tests/api/activitypub/cleaner.ts b/server/tests/api/activitypub/cleaner.ts index 75ef56ce3..27f17b4d6 100644 --- a/server/tests/api/activitypub/cleaner.ts +++ b/server/tests/api/activitypub/cleaner.ts | |||
@@ -7,16 +7,19 @@ import { | |||
7 | closeAllSequelize, | 7 | closeAllSequelize, |
8 | deleteAll, | 8 | deleteAll, |
9 | doubleFollow, | 9 | doubleFollow, |
10 | flushAndRunMultipleServers, | ||
10 | getCount, | 11 | getCount, |
12 | getVideo, | ||
13 | rateVideo, | ||
11 | selectQuery, | 14 | selectQuery, |
15 | ServerInfo, | ||
16 | setAccessTokensToServers, | ||
12 | setVideoField, | 17 | setVideoField, |
13 | updateQuery, | 18 | updateQuery, |
14 | wait | 19 | uploadVideoAndGetId, |
15 | } from '../../../../shared/extra-utils' | 20 | wait, |
16 | import { flushAndRunMultipleServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index' | 21 | waitJobs |
17 | import { waitJobs } from '../../../../shared/extra-utils/server/jobs' | 22 | } from '@shared/extra-utils' |
18 | import { addVideoCommentThread, getVideoCommentThreads } from '../../../../shared/extra-utils/videos/video-comments' | ||
19 | import { getVideo, rateVideo, uploadVideoAndGetId } from '../../../../shared/extra-utils/videos/videos' | ||
20 | 23 | ||
21 | const expect = chai.expect | 24 | const expect = chai.expect |
22 | 25 | ||
@@ -63,7 +66,7 @@ describe('Test AP cleaner', function () { | |||
63 | for (const server of servers) { | 66 | for (const server of servers) { |
64 | for (const uuid of videoUUIDs) { | 67 | for (const uuid of videoUUIDs) { |
65 | await rateVideo(server.url, server.accessToken, uuid, 'like') | 68 | await rateVideo(server.url, server.accessToken, uuid, 'like') |
66 | await addVideoCommentThread(server.url, server.accessToken, uuid, 'comment') | 69 | await server.commentsCommand.createThread({ videoId: uuid, text: 'comment' }) |
67 | } | 70 | } |
68 | } | 71 | } |
69 | 72 | ||
@@ -172,8 +175,8 @@ describe('Test AP cleaner', function () { | |||
172 | this.timeout(20000) | 175 | this.timeout(20000) |
173 | 176 | ||
174 | { | 177 | { |
175 | const res = await getVideoCommentThreads(servers[0].url, videoUUID1, 0, 5) | 178 | const { total } = await servers[0].commentsCommand.listThreads({ videoId: videoUUID1 }) |
176 | expect(res.body.total).to.equal(3) | 179 | expect(total).to.equal(3) |
177 | } | 180 | } |
178 | 181 | ||
179 | await deleteAll(servers[2].internalServerNumber, 'videoComment') | 182 | await deleteAll(servers[2].internalServerNumber, 'videoComment') |
@@ -182,8 +185,8 @@ describe('Test AP cleaner', function () { | |||
182 | await waitJobs(servers) | 185 | await waitJobs(servers) |
183 | 186 | ||
184 | { | 187 | { |
185 | const res = await getVideoCommentThreads(servers[0].url, videoUUID1, 0, 5) | 188 | const { total } = await servers[0].commentsCommand.listThreads({ videoId: videoUUID1 }) |
186 | expect(res.body.total).to.equal(2) | 189 | expect(total).to.equal(2) |
187 | } | 190 | } |
188 | }) | 191 | }) |
189 | 192 | ||