diff options
author | Chocobozzz <me@florianbigard.com> | 2020-08-26 15:03:00 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-08-26 15:03:00 +0200 |
commit | 20dcfd74982f4ec8a143696abed02b059d30d9ec (patch) | |
tree | 8956b19749f7d95a3a0e1b17c57c9b73a9ca6497 /server | |
parent | 000ca2a898a36214bbf8f787fef4af4cf5ad3c8d (diff) | |
download | PeerTube-20dcfd74982f4ec8a143696abed02b059d30d9ec.tar.gz PeerTube-20dcfd74982f4ec8a143696abed02b059d30d9ec.tar.zst PeerTube-20dcfd74982f4ec8a143696abed02b059d30d9ec.zip |
Deprecate old static routes
Diffstat (limited to 'server')
-rw-r--r-- | server/initializers/constants.ts | 4 | ||||
-rw-r--r-- | server/tests/api/server/services.ts | 2 | ||||
-rw-r--r-- | server/tests/api/videos/video-captions.ts | 10 | ||||
-rw-r--r-- | server/tests/api/videos/video-imports.ts | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index c26c3a88c..171e9e9c2 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -545,8 +545,8 @@ const STATIC_DOWNLOAD_PATHS = { | |||
545 | } | 545 | } |
546 | const LAZY_STATIC_PATHS = { | 546 | const LAZY_STATIC_PATHS = { |
547 | AVATARS: '/lazy-static/avatars/', | 547 | AVATARS: '/lazy-static/avatars/', |
548 | PREVIEWS: '/static/previews/', | 548 | PREVIEWS: '/lazy-static/previews/', |
549 | VIDEO_CAPTIONS: '/static/video-captions/' | 549 | VIDEO_CAPTIONS: '/lazy-static/video-captions/' |
550 | } | 550 | } |
551 | 551 | ||
552 | // Cache control | 552 | // Cache control |
diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts index 897f37c04..680e7a817 100644 --- a/server/tests/api/server/services.ts +++ b/server/tests/api/server/services.ts | |||
@@ -70,7 +70,7 @@ describe('Test services', function () { | |||
70 | const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' + | 70 | const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' + |
71 | `src="http://localhost:${server.port}/videos/embed/${server.video.uuid}" ` + | 71 | `src="http://localhost:${server.port}/videos/embed/${server.video.uuid}" ` + |
72 | 'frameborder="0" allowfullscreen></iframe>' | 72 | 'frameborder="0" allowfullscreen></iframe>' |
73 | const expectedThumbnailUrl = 'http://localhost:' + server.port + '/static/previews/' + server.video.uuid + '.jpg' | 73 | const expectedThumbnailUrl = 'http://localhost:' + server.port + '/lazy-static/previews/' + server.video.uuid + '.jpg' |
74 | 74 | ||
75 | expect(res.body.html).to.equal(expectedHtml) | 75 | expect(res.body.html).to.equal(expectedHtml) |
76 | expect(res.body.title).to.equal(server.video.name) | 76 | expect(res.body.title).to.equal(server.video.name) |
diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index b4ecb39f4..00e04d69d 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts | |||
@@ -83,13 +83,13 @@ describe('Test video captions', function () { | |||
83 | const caption1: VideoCaption = res.body.data[0] | 83 | const caption1: VideoCaption = res.body.data[0] |
84 | expect(caption1.language.id).to.equal('ar') | 84 | expect(caption1.language.id).to.equal('ar') |
85 | expect(caption1.language.label).to.equal('Arabic') | 85 | expect(caption1.language.label).to.equal('Arabic') |
86 | expect(caption1.captionPath).to.equal('/static/video-captions/' + videoUUID + '-ar.vtt') | 86 | expect(caption1.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-ar.vtt') |
87 | await testCaptionFile(server.url, caption1.captionPath, 'Subtitle good 1.') | 87 | await testCaptionFile(server.url, caption1.captionPath, 'Subtitle good 1.') |
88 | 88 | ||
89 | const caption2: VideoCaption = res.body.data[1] | 89 | const caption2: VideoCaption = res.body.data[1] |
90 | expect(caption2.language.id).to.equal('zh') | 90 | expect(caption2.language.id).to.equal('zh') |
91 | expect(caption2.language.label).to.equal('Chinese') | 91 | expect(caption2.language.label).to.equal('Chinese') |
92 | expect(caption2.captionPath).to.equal('/static/video-captions/' + videoUUID + '-zh.vtt') | 92 | expect(caption2.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-zh.vtt') |
93 | await testCaptionFile(server.url, caption2.captionPath, 'Subtitle good 2.') | 93 | await testCaptionFile(server.url, caption2.captionPath, 'Subtitle good 2.') |
94 | } | 94 | } |
95 | }) | 95 | }) |
@@ -117,7 +117,7 @@ describe('Test video captions', function () { | |||
117 | const caption1: VideoCaption = res.body.data[0] | 117 | const caption1: VideoCaption = res.body.data[0] |
118 | expect(caption1.language.id).to.equal('ar') | 118 | expect(caption1.language.id).to.equal('ar') |
119 | expect(caption1.language.label).to.equal('Arabic') | 119 | expect(caption1.language.label).to.equal('Arabic') |
120 | expect(caption1.captionPath).to.equal('/static/video-captions/' + videoUUID + '-ar.vtt') | 120 | expect(caption1.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-ar.vtt') |
121 | await testCaptionFile(server.url, caption1.captionPath, 'Subtitle good 2.') | 121 | await testCaptionFile(server.url, caption1.captionPath, 'Subtitle good 2.') |
122 | } | 122 | } |
123 | }) | 123 | }) |
@@ -148,7 +148,7 @@ describe('Test video captions', function () { | |||
148 | const caption1: VideoCaption = res.body.data[0] | 148 | const caption1: VideoCaption = res.body.data[0] |
149 | expect(caption1.language.id).to.equal('ar') | 149 | expect(caption1.language.id).to.equal('ar') |
150 | expect(caption1.language.label).to.equal('Arabic') | 150 | expect(caption1.language.label).to.equal('Arabic') |
151 | expect(caption1.captionPath).to.equal('/static/video-captions/' + videoUUID + '-ar.vtt') | 151 | expect(caption1.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-ar.vtt') |
152 | 152 | ||
153 | const expected = 'WEBVTT FILE\r\n' + | 153 | const expected = 'WEBVTT FILE\r\n' + |
154 | '\r\n' + | 154 | '\r\n' + |
@@ -185,7 +185,7 @@ describe('Test video captions', function () { | |||
185 | 185 | ||
186 | expect(caption.language.id).to.equal('zh') | 186 | expect(caption.language.id).to.equal('zh') |
187 | expect(caption.language.label).to.equal('Chinese') | 187 | expect(caption.language.label).to.equal('Chinese') |
188 | expect(caption.captionPath).to.equal('/static/video-captions/' + videoUUID + '-zh.vtt') | 188 | expect(caption.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-zh.vtt') |
189 | await testCaptionFile(server.url, caption.captionPath, 'Subtitle good 2.') | 189 | await testCaptionFile(server.url, caption.captionPath, 'Subtitle good 2.') |
190 | } | 190 | } |
191 | }) | 191 | }) |
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index efda4fc7b..adb97aba4 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts | |||
@@ -123,7 +123,7 @@ describe('Test video imports', function () { | |||
123 | const res = await importVideo(servers[0].url, servers[0].accessToken, attributes) | 123 | const res = await importVideo(servers[0].url, servers[0].accessToken, attributes) |
124 | expect(res.body.video.name).to.equal('small video - youtube') | 124 | expect(res.body.video.name).to.equal('small video - youtube') |
125 | expect(res.body.video.thumbnailPath).to.equal(`/static/thumbnails/${res.body.video.uuid}.jpg`) | 125 | expect(res.body.video.thumbnailPath).to.equal(`/static/thumbnails/${res.body.video.uuid}.jpg`) |
126 | expect(res.body.video.previewPath).to.equal(`/static/previews/${res.body.video.uuid}.jpg`) | 126 | expect(res.body.video.previewPath).to.equal(`/lazy-static/previews/${res.body.video.uuid}.jpg`) |
127 | await testImage(servers[0].url, 'video_import_thumbnail', res.body.video.thumbnailPath) | 127 | await testImage(servers[0].url, 'video_import_thumbnail', res.body.video.thumbnailPath) |
128 | await testImage(servers[0].url, 'video_import_preview', res.body.video.previewPath) | 128 | await testImage(servers[0].url, 'video_import_preview', res.body.video.previewPath) |
129 | 129 | ||