diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-06 12:11:08 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-06 12:11:08 +0200 |
commit | 3d52b300ea79bec21f090e2447c4808307078618 (patch) | |
tree | 5a68db9d557eb9449533162cf01f974e60b16885 /server/tests/api/videos | |
parent | 60979b076de00a7c7f6dde26617cd39357d9fc6d (diff) | |
parent | 2769e297ca6703f761f9b57792585eb1fc5aac49 (diff) | |
download | PeerTube-3d52b300ea79bec21f090e2447c4808307078618.tar.gz PeerTube-3d52b300ea79bec21f090e2447c4808307078618.tar.zst PeerTube-3d52b300ea79bec21f090e2447c4808307078618.zip |
Merge branch 'release/beta-10' into develop
Diffstat (limited to 'server/tests/api/videos')
-rw-r--r-- | server/tests/api/videos/video-captions.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index eb73c5baf..ba9ebbdd6 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts | |||
@@ -56,7 +56,8 @@ describe('Test video captions', function () { | |||
56 | accessToken: servers[0].accessToken, | 56 | accessToken: servers[0].accessToken, |
57 | language: 'zh', | 57 | language: 'zh', |
58 | videoId: videoUUID, | 58 | videoId: videoUUID, |
59 | fixture: 'subtitle-good2.vtt' | 59 | fixture: 'subtitle-good2.vtt', |
60 | mimeType: 'application/octet-stream' | ||
60 | }) | 61 | }) |
61 | 62 | ||
62 | await waitJobs(servers) | 63 | await waitJobs(servers) |