From 59651eee5600839cdc62911a211d61457d8456b7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Dec 2017 17:25:10 +0100 Subject: [PATCH] Fix videos tests --- server/tests/api/videos/multiple-servers.ts | 2 +- server/tests/api/videos/single-server.ts | 4 ++-- server/tests/utils/videos/videos.ts | 12 ++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 0c6508e71..2a943fe45 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -822,7 +822,7 @@ describe('Test multiple servers', function () { .field('nsfw', 'false') .field('channelId', '1') - const filePath = join(__dirname, '..', 'api', 'fixtures', 'video_short.webm') + const filePath = join(__dirname, '..', '..', 'api', 'fixtures', 'video_short.webm') await req.attach('videofile', filePath) .expect(200) diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index 02723654d..c503ec0e7 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -337,10 +337,10 @@ describe('Test a single server', function () { it('Should remove the video', async function () { await removeVideo(server.url, server.accessToken, videoId) - const files1 = await readdirPromise(join(__dirname, '..', '..', '..', 'test1/videos/')) + const files1 = await readdirPromise(join(__dirname, '..', '..', '..', '..', 'test1/videos/')) expect(files1).to.have.lengthOf(0) - const files2 = await readdirPromise(join(__dirname, '..', '..', '..', 'test1/thumbnails/')) + const files2 = await readdirPromise(join(__dirname, '..', '..', '..', '..', 'test1/thumbnails/')) expect(files2).to.have.lengthOf(0) }) diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 166253ffc..739394253 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -23,7 +23,8 @@ function getVideoCategories (url: string) { return makeGetRequest({ url, - path + path, + statusCodeExpected: 200 }) } @@ -32,7 +33,8 @@ function getVideoLicences (url: string) { return makeGetRequest({ url, - path + path, + statusCodeExpected: 200 }) } @@ -41,7 +43,8 @@ function getVideoLanguages (url: string) { return makeGetRequest({ url, - path + path, + statusCodeExpected: 200 }) } @@ -50,7 +53,8 @@ function getVideoPrivacies (url: string) { return makeGetRequest({ url, - path + path, + statusCodeExpected: 200 }) }