aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-11-24 10:49:12 +0100
committerChocobozzz <me@florianbigard.com>2021-11-24 10:49:12 +0100
commit450de91e22ba1388e14e12ada875c94e0c38f5d3 (patch)
treeca00d4e5ec1915f2bd336103d84c8dac86a34273 /server
parent17e2705f646f00346bfdbb663876b0f022eaeee3 (diff)
downloadPeerTube-450de91e22ba1388e14e12ada875c94e0c38f5d3.tar.gz
PeerTube-450de91e22ba1388e14e12ada875c94e0c38f5d3.tar.zst
PeerTube-450de91e22ba1388e14e12ada875c94e0c38f5d3.zip
Fix E2E tests
Diffstat (limited to 'server')
-rw-r--r--server/lib/client-html.ts5
-rw-r--r--server/tests/cli/create-import-video-file-job.ts1
2 files changed, 5 insertions, 1 deletions
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 84b4ca97d..84eb33348 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -335,6 +335,11 @@ class ClientHtml {
335 lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale() 335 lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale()
336 } 336 }
337 337
338 logger.debug(
339 'Serving %s HTML language', buildFileLocale(lang),
340 { cookie: req.cookies?.clientLanguage, paramLang, acceptLanguage: req.headers['accept-language'] }
341 )
342
338 return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html') 343 return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html')
339 } 344 }
340 345
diff --git a/server/tests/cli/create-import-video-file-job.ts b/server/tests/cli/create-import-video-file-job.ts
index 17ed67b05..c06b9550c 100644
--- a/server/tests/cli/create-import-video-file-job.ts
+++ b/server/tests/cli/create-import-video-file-job.ts
@@ -7,7 +7,6 @@ import {
7 cleanupTests, 7 cleanupTests,
8 createMultipleServers, 8 createMultipleServers,
9 doubleFollow, 9 doubleFollow,
10 expectNoFailedTranscodingJob,
11 expectStartWith, 10 expectStartWith,
12 makeRawRequest, 11 makeRawRequest,
13 ObjectStorageCommand, 12 ObjectStorageCommand,