From 99d103019c76c517ba607a0fab8022aa6d08ef2e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 7 Jun 2018 09:48:10 +0200 Subject: Move fixtures in tests/ --- server/tests/api/check-params/users.ts | 6 +++--- server/tests/api/check-params/videos.ts | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'server/tests/api/check-params') diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index e8a6ffd19..dba57778d 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -279,7 +279,7 @@ describe('Test users API validators', function () { it('Should fail without an incorrect input file', async function () { const fields = {} const attaches = { - 'avatarfile': join(__dirname, '..', 'fixtures', 'video_short.mp4') + 'avatarfile': join(__dirname, '..', '..', 'fixtures', 'video_short.mp4') } await makeUploadRequest({ url: server.url, path: path + '/me/avatar/pick', token: server.accessToken, fields, attaches }) }) @@ -287,7 +287,7 @@ describe('Test users API validators', function () { it('Should fail with a big file', async function () { const fields = {} const attaches = { - 'avatarfile': join(__dirname, '..', 'fixtures', 'avatar-big.png') + 'avatarfile': join(__dirname, '..', '..', 'fixtures', 'avatar-big.png') } await makeUploadRequest({ url: server.url, path: path + '/me/avatar/pick', token: server.accessToken, fields, attaches }) }) @@ -295,7 +295,7 @@ describe('Test users API validators', function () { it('Should succeed with the correct params', async function () { const fields = {} const attaches = { - 'avatarfile': join(__dirname, '..', 'fixtures', 'avatar.png') + 'avatarfile': join(__dirname, '..', '..', 'fixtures', 'avatar.png') } await makeUploadRequest({ url: server.url, diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts index 7b40b91e7..bc6c7fc46 100644 --- a/server/tests/api/check-params/videos.ts +++ b/server/tests/api/check-params/videos.ts @@ -163,7 +163,7 @@ describe('Test videos API validator', function () { describe('When adding a video', function () { let baseCorrectParams const baseCorrectAttaches = { - 'videofile': join(__dirname, '..', 'fixtures', 'video_short.webm') + 'videofile': join(__dirname, '..', '..', 'fixtures', 'video_short.webm') } before(function () { @@ -313,7 +313,7 @@ describe('Test videos API validator', function () { it('Should fail without an incorrect input file', async function () { const fields = baseCorrectParams const attaches = { - 'videofile': join(__dirname, '..', 'fixtures', 'video_short_fake.webm') + 'videofile': join(__dirname, '..', '..', 'fixtures', 'video_short_fake.webm') } await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches }) }) @@ -321,8 +321,8 @@ describe('Test videos API validator', function () { it('Should fail with an incorrect thumbnail file', async function () { const fields = baseCorrectParams const attaches = { - 'thumbnailfile': join(__dirname, '..', 'fixtures', 'avatar.png'), - 'videofile': join(__dirname, '..', 'fixtures', 'video_short_fake.webm') + 'thumbnailfile': join(__dirname, '..', '..', 'fixtures', 'avatar.png'), + 'videofile': join(__dirname, '..', '..', 'fixtures', 'video_short_fake.webm') } await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches }) @@ -331,8 +331,8 @@ describe('Test videos API validator', function () { it('Should fail with a big thumbnail file', async function () { const fields = baseCorrectParams const attaches = { - 'thumbnailfile': join(__dirname, '..', 'fixtures', 'avatar-big.png'), - 'videofile': join(__dirname, '..', 'fixtures', 'video_short_fake.webm') + 'thumbnailfile': join(__dirname, '..', '..', 'fixtures', 'avatar-big.png'), + 'videofile': join(__dirname, '..', '..', 'fixtures', 'video_short_fake.webm') } await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches }) @@ -341,8 +341,8 @@ describe('Test videos API validator', function () { it('Should fail with an incorrect preview file', async function () { const fields = baseCorrectParams const attaches = { - 'previewfile': join(__dirname, '..', 'fixtures', 'avatar.png'), - 'videofile': join(__dirname, '..', 'fixtures', 'video_short_fake.webm') + 'previewfile': join(__dirname, '..', '..', 'fixtures', 'avatar.png'), + 'videofile': join(__dirname, '..', '..', 'fixtures', 'video_short_fake.webm') } await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches }) @@ -351,8 +351,8 @@ describe('Test videos API validator', function () { it('Should fail with a big preview file', async function () { const fields = baseCorrectParams const attaches = { - 'previewfile': join(__dirname, '..', 'fixtures', 'avatar-big.png'), - 'videofile': join(__dirname, '..', 'fixtures', 'video_short_fake.webm') + 'previewfile': join(__dirname, '..', '..', 'fixtures', 'avatar-big.png'), + 'videofile': join(__dirname, '..', '..', 'fixtures', 'video_short_fake.webm') } await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches }) @@ -377,7 +377,7 @@ describe('Test videos API validator', function () { { const attaches = immutableAssign(baseCorrectAttaches, { - videofile: join(__dirname, '..', 'fixtures', 'video_short.mp4') + videofile: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4') }) await makeUploadRequest({ @@ -392,7 +392,7 @@ describe('Test videos API validator', function () { { const attaches = immutableAssign(baseCorrectAttaches, { - videofile: join(__dirname, '..', 'fixtures', 'video_short.ogv') + videofile: join(__dirname, '..', '..', 'fixtures', 'video_short.ogv') }) await makeUploadRequest({ @@ -510,7 +510,7 @@ describe('Test videos API validator', function () { it('Should fail with an incorrect thumbnail file', async function () { const fields = baseCorrectParams const attaches = { - 'thumbnailfile': join(__dirname, '..', 'fixtures', 'avatar.png') + 'thumbnailfile': join(__dirname, '..', '..', 'fixtures', 'avatar.png') } await makeUploadRequest({ @@ -526,7 +526,7 @@ describe('Test videos API validator', function () { it('Should fail with a big thumbnail file', async function () { const fields = baseCorrectParams const attaches = { - 'thumbnailfile': join(__dirname, '..', 'fixtures', 'avatar-big.png') + 'thumbnailfile': join(__dirname, '..', '..', 'fixtures', 'avatar-big.png') } await makeUploadRequest({ @@ -542,7 +542,7 @@ describe('Test videos API validator', function () { it('Should fail with an incorrect preview file', async function () { const fields = baseCorrectParams const attaches = { - 'previewfile': join(__dirname, '..', 'fixtures', 'avatar.png') + 'previewfile': join(__dirname, '..', '..', 'fixtures', 'avatar.png') } await makeUploadRequest({ @@ -558,7 +558,7 @@ describe('Test videos API validator', function () { it('Should fail with a big preview file', async function () { const fields = baseCorrectParams const attaches = { - 'previewfile': join(__dirname, '..', 'fixtures', 'avatar-big.png') + 'previewfile': join(__dirname, '..', '..', 'fixtures', 'avatar-big.png') } await makeUploadRequest({ -- cgit v1.2.3