diff options
author | Wicklow <wicklow@framasoft.org> | 2023-03-07 10:52:20 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2023-03-07 11:16:56 +0100 |
commit | 73fb3dc53571a6e94750a9d6cb5c2e949e1adcb9 (patch) | |
tree | f86cfe5b29a999bcbc10562e918df33429b468b4 /server/tests | |
parent | a3e5f7e732cca41267314d64307bdcfebd12e7de (diff) | |
download | PeerTube-73fb3dc53571a6e94750a9d6cb5c2e949e1adcb9.tar.gz PeerTube-73fb3dc53571a6e94750a9d6cb5c2e949e1adcb9.tar.zst PeerTube-73fb3dc53571a6e94750a9d6cb5c2e949e1adcb9.zip |
Fix file token reinjection on fragments
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/videos/video-static-file-privacy.ts | 5 | ||||
-rw-r--r-- | server/tests/shared/streaming-playlists.ts | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/api/videos/video-static-file-privacy.ts b/server/tests/api/videos/video-static-file-privacy.ts index ef0774b41..16530884e 100644 --- a/server/tests/api/videos/video-static-file-privacy.ts +++ b/server/tests/api/videos/video-static-file-privacy.ts | |||
@@ -256,10 +256,9 @@ describe('Test video static file privacy', function () { | |||
256 | const videoFileToken = await server.videoToken.getVideoFileToken({ videoId: uuid }) | 256 | const videoFileToken = await server.videoToken.getVideoFileToken({ videoId: uuid }) |
257 | await waitJobs([ server ]) | 257 | await waitJobs([ server ]) |
258 | 258 | ||
259 | const video = await server.videos.getWithToken({ id: uuid }) | ||
260 | const hls = video.streamingPlaylists[0] | ||
261 | |||
262 | { | 259 | { |
260 | const video = await server.videos.getWithToken({ id: uuid }) | ||
261 | const hls = video.streamingPlaylists[0] | ||
263 | const query = { videoFileToken } | 262 | const query = { videoFileToken } |
264 | const { text } = await makeRawRequest({ url: hls.playlistUrl, query, expectedStatus: HttpStatusCode.OK_200 }) | 263 | const { text } = await makeRawRequest({ url: hls.playlistUrl, query, expectedStatus: HttpStatusCode.OK_200 }) |
265 | 264 | ||
diff --git a/server/tests/shared/streaming-playlists.ts b/server/tests/shared/streaming-playlists.ts index 75e135c4e..1c38cb512 100644 --- a/server/tests/shared/streaming-playlists.ts +++ b/server/tests/shared/streaming-playlists.ts | |||
@@ -214,7 +214,7 @@ async function checkVideoFileTokenReinjection (options: { | |||
214 | ? i | 214 | ? i |
215 | : `-${resolution}` | 215 | : `-${resolution}` |
216 | 216 | ||
217 | expect(text).to.contain(`${suffix}.m3u8?videoFileToken=${videoFileToken}`) | 217 | expect(text).to.contain(`${suffix}.m3u8?videoFileToken=${videoFileToken}&reinjectVideoFileToken=true`) |
218 | } | 218 | } |
219 | 219 | ||
220 | const resolutionPlaylists = extractResolutionPlaylistUrls(hls.playlistUrl, text) | 220 | const resolutionPlaylists = extractResolutionPlaylistUrls(hls.playlistUrl, text) |
@@ -228,6 +228,7 @@ async function checkVideoFileTokenReinjection (options: { | |||
228 | : '.mp4' | 228 | : '.mp4' |
229 | 229 | ||
230 | expect(text).to.contain(`${extension}?videoFileToken=${videoFileToken}`) | 230 | expect(text).to.contain(`${extension}?videoFileToken=${videoFileToken}`) |
231 | expect(text).not.to.contain(`reinjectVideoFileToken=true`) | ||
231 | } | 232 | } |
232 | } | 233 | } |
233 | 234 | ||