diff options
Diffstat (limited to 'shared/extra-utils')
-rw-r--r-- | shared/extra-utils/miscs/tests.ts | 2 | ||||
-rw-r--r-- | shared/extra-utils/videos/captions.ts | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/shared/extra-utils/miscs/tests.ts b/shared/extra-utils/miscs/tests.ts index 6299a48f5..658fe5fd3 100644 --- a/shared/extra-utils/miscs/tests.ts +++ b/shared/extra-utils/miscs/tests.ts | |||
@@ -20,7 +20,7 @@ const FIXTURE_URLS = { | |||
20 | youtubeHDR: 'https://www.youtube.com/watch?v=RQgnBB9z_N4', | 20 | youtubeHDR: 'https://www.youtube.com/watch?v=RQgnBB9z_N4', |
21 | 21 | ||
22 | // eslint-disable-next-line max-len | 22 | // eslint-disable-next-line max-len |
23 | magnet: 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4', | 23 | magnet: 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Flazy-static%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4', |
24 | 24 | ||
25 | badVideo: 'https://download.cpy.re/peertube/bad_video.mp4', | 25 | badVideo: 'https://download.cpy.re/peertube/bad_video.mp4', |
26 | goodVideo: 'https://download.cpy.re/peertube/good_video.mp4', | 26 | goodVideo: 'https://download.cpy.re/peertube/good_video.mp4', |
diff --git a/shared/extra-utils/videos/captions.ts b/shared/extra-utils/videos/captions.ts index fc44cd250..35e722408 100644 --- a/shared/extra-utils/videos/captions.ts +++ b/shared/extra-utils/videos/captions.ts | |||
@@ -2,12 +2,16 @@ import { expect } from 'chai' | |||
2 | import request from 'supertest' | 2 | import request from 'supertest' |
3 | import { HttpStatusCode } from '@shared/models' | 3 | import { HttpStatusCode } from '@shared/models' |
4 | 4 | ||
5 | async function testCaptionFile (url: string, captionPath: string, containsString: string) { | 5 | async function testCaptionFile (url: string, captionPath: string, toTest: RegExp | string) { |
6 | const res = await request(url) | 6 | const res = await request(url) |
7 | .get(captionPath) | 7 | .get(captionPath) |
8 | .expect(HttpStatusCode.OK_200) | 8 | .expect(HttpStatusCode.OK_200) |
9 | 9 | ||
10 | expect(res.text).to.contain(containsString) | 10 | if (toTest instanceof RegExp) { |
11 | expect(res.text).to.match(toTest) | ||
12 | } else { | ||
13 | expect(res.text).to.contain(toTest) | ||
14 | } | ||
11 | } | 15 | } |
12 | 16 | ||
13 | // --------------------------------------------------------------------------- | 17 | // --------------------------------------------------------------------------- |