X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Futils%2Fmiscs%2Fmiscs.ts;h=91a93b631f77673dd846f0082e86eabfc0f5441d;hb=2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f;hp=589daa420d54c561867d6ddda827ee14828f3829;hpb=35adc403b7eed6d1309bbce901268a76dd01b6ef;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/utils/miscs/miscs.ts b/shared/utils/miscs/miscs.ts index 589daa420..91a93b631 100644 --- a/shared/utils/miscs/miscs.ts +++ b/shared/utils/miscs/miscs.ts @@ -33,8 +33,8 @@ function webtorrentAdd (torrent: string, refreshWebTorrent = false) { } function root () { - // We are in server/tests/utils/miscs - return join(__dirname, '..', '..', '..', '..') + // We are in /shared/utils/miscs + return join(__dirname, '..', '..', '..') } async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') { @@ -44,7 +44,7 @@ async function testImage (url: string, imageName: string, imagePath: string, ext const body = res.body - const data = await readFile(join(__dirname, '..', '..', 'fixtures', imageName + extension)) + const data = await readFile(join(root(), 'server', 'tests', 'fixtures', imageName + extension)) const minLength = body.length - ((20 * body.length) / 100) const maxLength = body.length + ((20 * body.length) / 100) @@ -59,7 +59,7 @@ function buildAbsoluteFixturePath (path: string, customTravisPath = false) { if (customTravisPath && process.env.TRAVIS) return join(process.env.HOME, 'fixtures', path) - return join(__dirname, '..', '..', 'fixtures', path) + return join(root(), 'server', 'tests', 'fixtures', path) } async function generateHighBitrateVideo () {