Merge branch 'release/4.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / videos / resumable-upload.ts

diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts
index b6d70ed44b2ef85d9b3936d914f705baf0782788..0cf1e66757f82a484851837d0770ed1cc3442130 100644 (file)
--- a/server/tests/api/videos/resumable-upload.ts
+++ b/server/tests/api/videos/resumable-upload.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { pathExists, readdir, stat } from 'fs-extra'
 import { join } from 'path'
 import { buildAbsoluteFixturePath } from '@shared/core-utils'
@@ -9,8 +8,6 @@ import { sha1 } from '@shared/extra-utils'
 import { HttpStatusCode, VideoPrivacy } from '@shared/models'
 import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands'
 
-const expect = chai.expect
-
 // Most classic resumable upload tests are done in other test suites
 
 describe('Test resumable upload', function () {
@@ -172,11 +169,11 @@ describe('Test resumable upload', function () {
     it('Should not accept more chunks than expected with an invalid content length/content range', async function () {
       const uploadId = await prepareUpload({ size: 1500 })
 
-      // Content length check seems to have changed in v16
-      if (process.version.startsWith('v16')) {
+      // Content length check can be different depending on the node version
+      try {
         await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409, contentLength: 1000 })
-        await checkFileSize(uploadId, 1000)
-      } else {
+        await checkFileSize(uploadId, 0)
+      } catch {
         await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 })
         await checkFileSize(uploadId, 0)
       }