X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Futils%2Fmiscs%2Fmiscs.ts;h=b2f80e9b13fc9470b4d9ac3e7f2eba9ac1f71bfa;hb=62689b942b71cd1dd0d050c6ed05f884a0b325c2;hp=f93e2372e73b5e06ba390a36348773fd3f2c2b83;hpb=9ee83eb99e908c6038cbb6501bacfe18d092f0b6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/utils/miscs/miscs.ts b/server/tests/utils/miscs/miscs.ts
index f93e2372e..b2f80e9b1 100644
--- a/server/tests/utils/miscs/miscs.ts
+++ b/server/tests/utils/miscs/miscs.ts
@@ -1,11 +1,12 @@
 /* tslint:disable:no-unused-expression */
 
-import { expect } from 'chai'
-import { join } from 'path'
+import * as chai from 'chai'
+import { isAbsolute, join } from 'path'
 import * as request from 'supertest'
 import * as WebTorrent from 'webtorrent'
-import { readFileBufferPromise } from '../../../helpers/core-utils'
+import { readFile } from 'fs-extra'
 
+const expect = chai.expect
 let webtorrent = new WebTorrent()
 
 function immutableAssign <T, U> (target: T, source: U) {
@@ -36,24 +37,26 @@ function root () {
 }
 
 async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') {
-  // Don't test images if the node env is not set
-  // Because we need a special ffmpeg version for this test
-  if (process.env[ 'NODE_TEST_IMAGE' ]) {
-    const res = await request(url)
-      .get(imagePath)
-      .expect(200)
-
-    const body = res.body
-
-    const data = await readFileBufferPromise(join(__dirname, '..', '..', 'api', 'fixtures', imageName + extension))
-    const minLength = body.length - ((50 * body.length) / 100)
-    const maxLength = body.length + ((50 * body.length) / 100)
-
-    return data.length > minLength && data.length < maxLength
-  } else {
-    console.log('Do not test images. Enable it by setting NODE_TEST_IMAGE env variable.')
-    return true
+  const res = await request(url)
+    .get(imagePath)
+    .expect(200)
+
+  const body = res.body
+
+  const data = await readFile(join(__dirname, '..', '..', 'fixtures', imageName + extension))
+  const minLength = body.length - ((20 * body.length) / 100)
+  const maxLength = body.length + ((20 * body.length) / 100)
+
+  expect(data.length).to.be.above(minLength)
+  expect(data.length).to.be.below(maxLength)
+}
+
+function buildAbsoluteFixturePath (path: string) {
+  if (isAbsolute(path)) {
+    return path
   }
+
+  return join(__dirname, '..', '..', 'fixtures', path)
 }
 
 // ---------------------------------------------------------------------------
@@ -64,5 +67,6 @@ export {
   webtorrentAdd,
   immutableAssign,
   testImage,
+  buildAbsoluteFixturePath,
   root
 }