From 7b0956ec4f7753c864c4cea220e6f189327baa93 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 14 Feb 2018 18:21:14 +0100 Subject: Fix tests --- server/tests/utils/miscs/miscs.ts | 5 ++++- server/tests/utils/videos/videos.ts | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'server/tests/utils') diff --git a/server/tests/utils/miscs/miscs.ts b/server/tests/utils/miscs/miscs.ts index 24cbf59ca..53cb67baf 100644 --- a/server/tests/utils/miscs/miscs.ts +++ b/server/tests/utils/miscs/miscs.ts @@ -1,10 +1,12 @@ /* tslint:disable:no-unused-expression */ +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' +const expect = chai.expect let webtorrent = new WebTorrent() function immutableAssign (target: T, source: U) { @@ -48,7 +50,8 @@ async function testImage (url: string, imageName: string, imagePath: string, ext const minLength = body.length - ((20 * body.length) / 100) const maxLength = body.length + ((20 * body.length) / 100) - return data.length > minLength && data.length < maxLength + expect(data.length).to.be.above(minLength) + expect(data.length).to.be.below(maxLength) } else { console.log('Do not test images. Enable it by setting NODE_TEST_IMAGE env variable.') return true diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 8e58f1f0c..9a4af0b9f 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -445,13 +445,11 @@ async function completeVideoCheck ( expect(file.size).to.be.above(minSize).and.below(maxSize) { - const test = await testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath) - expect(test).to.equal(true) + await testImage(url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath) } if (attributes.previewfile) { - const test = await testImage(url, attributes.previewfile, videoDetails.previewPath) - expect(test).to.equal(true) + await testImage(url, attributes.previewfile, videoDetails.previewPath) } const torrent = await webtorrentAdd(magnetUri, true) -- cgit v1.2.3