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 ++++++++++----------- server/tests/api/fixtures/avatar-big.png | Bin 146585 -> 0 bytes server/tests/api/fixtures/avatar-resized.png | Bin 1727 -> 0 bytes server/tests/api/fixtures/avatar.png | Bin 1674 -> 0 bytes server/tests/api/fixtures/avatar2-resized.png | Bin 1725 -> 0 bytes server/tests/api/fixtures/avatar2.png | Bin 4850 -> 0 bytes server/tests/api/fixtures/preview.jpg | Bin 4215 -> 0 bytes server/tests/api/fixtures/thumbnail.jpg | Bin 1457 -> 0 bytes server/tests/api/fixtures/video_60fps_short.mp4 | Bin 33968 -> 0 bytes server/tests/api/fixtures/video_short-480.webm | Bin 69217 -> 0 bytes server/tests/api/fixtures/video_short.mp4 | Bin 38783 -> 0 bytes server/tests/api/fixtures/video_short.mp4.jpg | Bin 2618 -> 0 bytes server/tests/api/fixtures/video_short.ogv | Bin 140849 -> 0 bytes server/tests/api/fixtures/video_short.ogv.jpg | Bin 2618 -> 0 bytes server/tests/api/fixtures/video_short.webm | Bin 218910 -> 0 bytes server/tests/api/fixtures/video_short.webm.jpg | Bin 2615 -> 0 bytes .../api/fixtures/video_short1-preview.webm.jpg | Bin 10181 -> 0 bytes server/tests/api/fixtures/video_short1.webm | Bin 572456 -> 0 bytes server/tests/api/fixtures/video_short1.webm.jpg | Bin 2901 -> 0 bytes server/tests/api/fixtures/video_short2.webm | Bin 942961 -> 0 bytes server/tests/api/fixtures/video_short2.webm.jpg | Bin 3185 -> 0 bytes server/tests/api/fixtures/video_short3.webm | Bin 292677 -> 0 bytes server/tests/api/fixtures/video_short3.webm.jpg | Bin 2886 -> 0 bytes server/tests/api/fixtures/video_short_fake.webm | 1 - server/tests/api/videos/multiple-servers.ts | 2 +- 26 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 server/tests/api/fixtures/avatar-big.png delete mode 100644 server/tests/api/fixtures/avatar-resized.png delete mode 100644 server/tests/api/fixtures/avatar.png delete mode 100644 server/tests/api/fixtures/avatar2-resized.png delete mode 100644 server/tests/api/fixtures/avatar2.png delete mode 100644 server/tests/api/fixtures/preview.jpg delete mode 100644 server/tests/api/fixtures/thumbnail.jpg delete mode 100644 server/tests/api/fixtures/video_60fps_short.mp4 delete mode 100644 server/tests/api/fixtures/video_short-480.webm delete mode 100644 server/tests/api/fixtures/video_short.mp4 delete mode 100644 server/tests/api/fixtures/video_short.mp4.jpg delete mode 100644 server/tests/api/fixtures/video_short.ogv delete mode 100644 server/tests/api/fixtures/video_short.ogv.jpg delete mode 100644 server/tests/api/fixtures/video_short.webm delete mode 100644 server/tests/api/fixtures/video_short.webm.jpg delete mode 100644 server/tests/api/fixtures/video_short1-preview.webm.jpg delete mode 100644 server/tests/api/fixtures/video_short1.webm delete mode 100644 server/tests/api/fixtures/video_short1.webm.jpg delete mode 100644 server/tests/api/fixtures/video_short2.webm delete mode 100644 server/tests/api/fixtures/video_short2.webm.jpg delete mode 100644 server/tests/api/fixtures/video_short3.webm delete mode 100644 server/tests/api/fixtures/video_short3.webm.jpg delete mode 100644 server/tests/api/fixtures/video_short_fake.webm (limited to 'server/tests/api') 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({ diff --git a/server/tests/api/fixtures/avatar-big.png b/server/tests/api/fixtures/avatar-big.png deleted file mode 100644 index e593e40da..000000000 Binary files a/server/tests/api/fixtures/avatar-big.png and /dev/null differ diff --git a/server/tests/api/fixtures/avatar-resized.png b/server/tests/api/fixtures/avatar-resized.png deleted file mode 100644 index 9d84151f8..000000000 Binary files a/server/tests/api/fixtures/avatar-resized.png and /dev/null differ diff --git a/server/tests/api/fixtures/avatar.png b/server/tests/api/fixtures/avatar.png deleted file mode 100644 index 4b7fd2c0a..000000000 Binary files a/server/tests/api/fixtures/avatar.png and /dev/null differ diff --git a/server/tests/api/fixtures/avatar2-resized.png b/server/tests/api/fixtures/avatar2-resized.png deleted file mode 100644 index 44149facb..000000000 Binary files a/server/tests/api/fixtures/avatar2-resized.png and /dev/null differ diff --git a/server/tests/api/fixtures/avatar2.png b/server/tests/api/fixtures/avatar2.png deleted file mode 100644 index dae702190..000000000 Binary files a/server/tests/api/fixtures/avatar2.png and /dev/null differ diff --git a/server/tests/api/fixtures/preview.jpg b/server/tests/api/fixtures/preview.jpg deleted file mode 100644 index c40ece838..000000000 Binary files a/server/tests/api/fixtures/preview.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/thumbnail.jpg b/server/tests/api/fixtures/thumbnail.jpg deleted file mode 100644 index cc3af8a4a..000000000 Binary files a/server/tests/api/fixtures/thumbnail.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_60fps_short.mp4 b/server/tests/api/fixtures/video_60fps_short.mp4 deleted file mode 100644 index ff0593cf3..000000000 Binary files a/server/tests/api/fixtures/video_60fps_short.mp4 and /dev/null differ diff --git a/server/tests/api/fixtures/video_short-480.webm b/server/tests/api/fixtures/video_short-480.webm deleted file mode 100644 index 3145105e1..000000000 Binary files a/server/tests/api/fixtures/video_short-480.webm and /dev/null differ diff --git a/server/tests/api/fixtures/video_short.mp4 b/server/tests/api/fixtures/video_short.mp4 deleted file mode 100644 index 35678362b..000000000 Binary files a/server/tests/api/fixtures/video_short.mp4 and /dev/null differ diff --git a/server/tests/api/fixtures/video_short.mp4.jpg b/server/tests/api/fixtures/video_short.mp4.jpg deleted file mode 100644 index 48790ffec..000000000 Binary files a/server/tests/api/fixtures/video_short.mp4.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short.ogv b/server/tests/api/fixtures/video_short.ogv deleted file mode 100644 index 9e253da82..000000000 Binary files a/server/tests/api/fixtures/video_short.ogv and /dev/null differ diff --git a/server/tests/api/fixtures/video_short.ogv.jpg b/server/tests/api/fixtures/video_short.ogv.jpg deleted file mode 100644 index c4c1d00e5..000000000 Binary files a/server/tests/api/fixtures/video_short.ogv.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short.webm b/server/tests/api/fixtures/video_short.webm deleted file mode 100644 index bf4b0ab6c..000000000 Binary files a/server/tests/api/fixtures/video_short.webm and /dev/null differ diff --git a/server/tests/api/fixtures/video_short.webm.jpg b/server/tests/api/fixtures/video_short.webm.jpg deleted file mode 100644 index b0dffd099..000000000 Binary files a/server/tests/api/fixtures/video_short.webm.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short1-preview.webm.jpg b/server/tests/api/fixtures/video_short1-preview.webm.jpg deleted file mode 100644 index d2a068b78..000000000 Binary files a/server/tests/api/fixtures/video_short1-preview.webm.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short1.webm b/server/tests/api/fixtures/video_short1.webm deleted file mode 100644 index 70ac0c644..000000000 Binary files a/server/tests/api/fixtures/video_short1.webm and /dev/null differ diff --git a/server/tests/api/fixtures/video_short1.webm.jpg b/server/tests/api/fixtures/video_short1.webm.jpg deleted file mode 100644 index 2db21975c..000000000 Binary files a/server/tests/api/fixtures/video_short1.webm.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short2.webm b/server/tests/api/fixtures/video_short2.webm deleted file mode 100644 index 13d72dff7..000000000 Binary files a/server/tests/api/fixtures/video_short2.webm and /dev/null differ diff --git a/server/tests/api/fixtures/video_short2.webm.jpg b/server/tests/api/fixtures/video_short2.webm.jpg deleted file mode 100644 index ed5952e04..000000000 Binary files a/server/tests/api/fixtures/video_short2.webm.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short3.webm b/server/tests/api/fixtures/video_short3.webm deleted file mode 100644 index cde5dcd58..000000000 Binary files a/server/tests/api/fixtures/video_short3.webm and /dev/null differ diff --git a/server/tests/api/fixtures/video_short3.webm.jpg b/server/tests/api/fixtures/video_short3.webm.jpg deleted file mode 100644 index b7c41cc1a..000000000 Binary files a/server/tests/api/fixtures/video_short3.webm.jpg and /dev/null differ diff --git a/server/tests/api/fixtures/video_short_fake.webm b/server/tests/api/fixtures/video_short_fake.webm deleted file mode 100644 index d85290ae5..000000000 --- a/server/tests/api/fixtures/video_short_fake.webm +++ /dev/null @@ -1 +0,0 @@ -this is a fake video mouahahah diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index fc7c0cb21..5f9a76621 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -938,7 +938,7 @@ describe('Test multiple servers', function () { .field('channelId', '1') .field('commentsEnabled', 'true') - const filePath = join(__dirname, '..', '..', 'api', 'fixtures', 'video_short.webm') + const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm') await req.attach('videofile', filePath) .expect(200) -- cgit v1.2.3