diff options
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/multiple-servers.ts | 33 | ||||
-rw-r--r-- | server/tests/api/single-server.ts | 5 | ||||
-rw-r--r-- | server/tests/utils/videos.ts | 10 |
3 files changed, 32 insertions, 16 deletions
diff --git a/server/tests/api/multiple-servers.ts b/server/tests/api/multiple-servers.ts index 052b0231f..c80ded862 100644 --- a/server/tests/api/multiple-servers.ts +++ b/server/tests/api/multiple-servers.ts | |||
@@ -25,6 +25,7 @@ import { | |||
25 | doubleFollow | 25 | doubleFollow |
26 | } from '../utils' | 26 | } from '../utils' |
27 | import { createUser } from '../utils/users' | 27 | import { createUser } from '../utils/users' |
28 | import { viewVideo } from '../utils/videos' | ||
28 | 29 | ||
29 | const expect = chai.expect | 30 | const expect = chai.expect |
30 | 31 | ||
@@ -486,10 +487,10 @@ describe('Test multiple servers', function () { | |||
486 | this.timeout(10000) | 487 | this.timeout(10000) |
487 | 488 | ||
488 | const tasks: Promise<any>[] = [] | 489 | const tasks: Promise<any>[] = [] |
489 | tasks.push(getVideo(servers[2].url, localVideosServer3[0])) | 490 | tasks.push(viewVideo(servers[2].url, localVideosServer3[0])) |
490 | tasks.push(getVideo(servers[2].url, localVideosServer3[0])) | 491 | tasks.push(viewVideo(servers[2].url, localVideosServer3[0])) |
491 | tasks.push(getVideo(servers[2].url, localVideosServer3[0])) | 492 | tasks.push(viewVideo(servers[2].url, localVideosServer3[0])) |
492 | tasks.push(getVideo(servers[2].url, localVideosServer3[1])) | 493 | tasks.push(viewVideo(servers[2].url, localVideosServer3[1])) |
493 | 494 | ||
494 | await Promise.all(tasks) | 495 | await Promise.all(tasks) |
495 | 496 | ||
@@ -502,8 +503,8 @@ describe('Test multiple servers', function () { | |||
502 | const video0 = videos.find(v => v.uuid === localVideosServer3[0]) | 503 | const video0 = videos.find(v => v.uuid === localVideosServer3[0]) |
503 | const video1 = videos.find(v => v.uuid === localVideosServer3[1]) | 504 | const video1 = videos.find(v => v.uuid === localVideosServer3[1]) |
504 | 505 | ||
505 | expect(video0.views).to.equal(7) | 506 | expect(video0.views).to.equal(3) |
506 | expect(video1.views).to.equal(5) | 507 | expect(video1.views).to.equal(1) |
507 | } | 508 | } |
508 | }) | 509 | }) |
509 | 510 | ||
@@ -511,16 +512,16 @@ describe('Test multiple servers', function () { | |||
511 | this.timeout(15000) | 512 | this.timeout(15000) |
512 | 513 | ||
513 | const tasks: Promise<any>[] = [] | 514 | const tasks: Promise<any>[] = [] |
514 | tasks.push(getVideo(servers[0].url, remoteVideosServer1[0])) | 515 | tasks.push(viewVideo(servers[0].url, remoteVideosServer1[0])) |
515 | tasks.push(getVideo(servers[1].url, remoteVideosServer2[0])) | 516 | tasks.push(viewVideo(servers[1].url, remoteVideosServer2[0])) |
516 | tasks.push(getVideo(servers[1].url, remoteVideosServer2[0])) | 517 | tasks.push(viewVideo(servers[1].url, remoteVideosServer2[0])) |
517 | tasks.push(getVideo(servers[2].url, remoteVideosServer3[0])) | 518 | tasks.push(viewVideo(servers[2].url, remoteVideosServer3[0])) |
518 | tasks.push(getVideo(servers[2].url, remoteVideosServer3[1])) | 519 | tasks.push(viewVideo(servers[2].url, remoteVideosServer3[1])) |
519 | tasks.push(getVideo(servers[2].url, remoteVideosServer3[1])) | 520 | tasks.push(viewVideo(servers[2].url, remoteVideosServer3[1])) |
520 | tasks.push(getVideo(servers[2].url, remoteVideosServer3[1])) | 521 | tasks.push(viewVideo(servers[2].url, remoteVideosServer3[1])) |
521 | tasks.push(getVideo(servers[2].url, localVideosServer3[1])) | 522 | tasks.push(viewVideo(servers[2].url, localVideosServer3[1])) |
522 | tasks.push(getVideo(servers[2].url, localVideosServer3[1])) | 523 | tasks.push(viewVideo(servers[2].url, localVideosServer3[1])) |
523 | tasks.push(getVideo(servers[2].url, localVideosServer3[1])) | 524 | tasks.push(viewVideo(servers[2].url, localVideosServer3[1])) |
524 | 525 | ||
525 | await Promise.all(tasks) | 526 | await Promise.all(tasks) |
526 | 527 | ||
diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts index 40e2c64fe..041d13225 100644 --- a/server/tests/api/single-server.ts +++ b/server/tests/api/single-server.ts | |||
@@ -33,6 +33,7 @@ import { | |||
33 | searchVideoWithSort, | 33 | searchVideoWithSort, |
34 | updateVideo | 34 | updateVideo |
35 | } from '../utils' | 35 | } from '../utils' |
36 | import { viewVideo } from '../utils/videos' | ||
36 | 37 | ||
37 | describe('Test a single server', function () { | 38 | describe('Test a single server', function () { |
38 | let server: ServerInfo = null | 39 | let server: ServerInfo = null |
@@ -214,6 +215,10 @@ describe('Test a single server', function () { | |||
214 | }) | 215 | }) |
215 | 216 | ||
216 | it('Should have the views updated', async function () { | 217 | it('Should have the views updated', async function () { |
218 | await viewVideo(server.url, videoId) | ||
219 | await viewVideo(server.url, videoId) | ||
220 | await viewVideo(server.url, videoId) | ||
221 | |||
217 | const res = await getVideo(server.url, videoId) | 222 | const res = await getVideo(server.url, videoId) |
218 | 223 | ||
219 | const video = res.body | 224 | const video = res.body |
diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos.ts index dababe924..73a9f1a0a 100644 --- a/server/tests/utils/videos.ts +++ b/server/tests/utils/videos.ts | |||
@@ -55,6 +55,15 @@ function getVideo (url: string, id: number | string, expectedStatus = 200) { | |||
55 | .expect(expectedStatus) | 55 | .expect(expectedStatus) |
56 | } | 56 | } |
57 | 57 | ||
58 | function viewVideo (url: string, id: number | string, expectedStatus = 204) { | ||
59 | const path = '/api/v1/videos/' + id + '/views' | ||
60 | |||
61 | return request(url) | ||
62 | .post(path) | ||
63 | .set('Accept', 'application/json') | ||
64 | .expect(expectedStatus) | ||
65 | } | ||
66 | |||
58 | function getVideoWithToken (url: string, token: string, id: number | string, expectedStatus = 200) { | 67 | function getVideoWithToken (url: string, token: string, id: number | string, expectedStatus = 200) { |
59 | const path = '/api/v1/videos/' + id | 68 | const path = '/api/v1/videos/' + id |
60 | 69 | ||
@@ -313,5 +322,6 @@ export { | |||
313 | uploadVideo, | 322 | uploadVideo, |
314 | updateVideo, | 323 | updateVideo, |
315 | rateVideo, | 324 | rateVideo, |
325 | viewVideo, | ||
316 | parseTorrentVideo | 326 | parseTorrentVideo |
317 | } | 327 | } |