X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fvideo-captions.ts;h=bfce5ca4767524c46fe891a8bc88a28a886768d2;hb=0a8a79552cf59c800011c9f63eaa8658230acddc;hp=12f890db8114dceca0ce252123cf74fec9751e91;hpb=40e87e9ecc54e3513fb586928330a7855eb192c6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts index 12f890db8..bfce5ca47 100644 --- a/server/tests/api/check-params/video-captions.ts +++ b/server/tests/api/check-params/video-captions.ts @@ -1,66 +1,58 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import * as chai from 'chai' -import 'mocha' +import { buildAbsoluteFixturePath } from '@shared/core-utils' +import { HttpStatusCode, VideoCreateResult, VideoPrivacy } from '@shared/models' import { - createUser, - flushTests, - killallServers, + cleanupTests, + createSingleServer, makeDeleteRequest, makeGetRequest, makeUploadRequest, - runServer, - ServerInfo, - setAccessTokensToServers, - uploadVideo, - userLogin -} from '../../utils' -import { join } from 'path' + PeerTubeServer, + setAccessTokensToServers +} from '@shared/server-commands' describe('Test video captions API validator', function () { const path = '/api/v1/videos/' - let server: ServerInfo + let server: PeerTubeServer let userAccessToken: string - let videoUUID: string + let video: VideoCreateResult + let privateVideo: VideoCreateResult // --------------------------------------------------------------- before(async function () { this.timeout(30000) - await flushTests() - - server = await runServer(1) + server = await createSingleServer(1) await setAccessTokensToServers([ server ]) - { - const res = await uploadVideo(server.url, server.accessToken, {}) - videoUUID = res.body.video.uuid - } + video = await server.videos.upload() + privateVideo = await server.videos.upload({ attributes: { privacy: VideoPrivacy.PRIVATE } }) { const user = { username: 'user1', password: 'my super password' } - await createUser(server.url, server.accessToken, user.username, user.password) - userAccessToken = await userLogin(server, user) + await server.users.create({ username: user.username, password: user.password }) + userAccessToken = await server.login.getAccessToken(user) } }) describe('When adding video caption', function () { const fields = { } const attaches = { - 'captionfile': join(__dirname, '..', '..', 'fixtures', 'subtitle-good1.vtt') + captionfile: buildAbsoluteFixturePath('subtitle-good1.vtt') } it('Should fail without a valid uuid', async function () { await makeUploadRequest({ method: 'PUT', url: server.url, - path: path + '4da6fde3-88f7-4d16-b119-108df563d0b06/captions', + path: path + '4da6fde3-88f7-4d16-b119-108df563d0b06/captions/fr', token: server.accessToken, fields, attaches @@ -71,15 +63,16 @@ describe('Test video captions API validator', function () { await makeUploadRequest({ method: 'PUT', url: server.url, - path: path + '4da6fde3-88f7-4d16-b119-108df5630b06/captions', + path: path + '4da6fde3-88f7-4d16-b119-108df5630b06/captions/fr', token: server.accessToken, fields, - attaches + attaches, + expectedStatus: 404 }) }) it('Should fail with a missing language in path', async function () { - const captionPath = path + videoUUID + '/captions' + const captionPath = path + video.uuid + '/captions' await makeUploadRequest({ method: 'PUT', url: server.url, @@ -91,7 +84,7 @@ describe('Test video captions API validator', function () { }) it('Should fail with an unknown language', async function () { - const captionPath = path + videoUUID + '/captions/15' + const captionPath = path + video.uuid + '/captions/15' await makeUploadRequest({ method: 'PUT', url: server.url, @@ -103,19 +96,19 @@ describe('Test video captions API validator', function () { }) it('Should fail without access token', async function () { - const captionPath = path + videoUUID + '/captions/fr' + const captionPath = path + video.uuid + '/captions/fr' await makeUploadRequest({ method: 'PUT', url: server.url, path: captionPath, fields, attaches, - statusCodeExpected: 401 + expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) }) it('Should fail with a bad access token', async function () { - const captionPath = path + videoUUID + '/captions/fr' + const captionPath = path + video.uuid + '/captions/fr' await makeUploadRequest({ method: 'PUT', url: server.url, @@ -123,12 +116,70 @@ describe('Test video captions API validator', function () { token: 'blabla', fields, attaches, - statusCodeExpected: 401 + expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) }) + // We accept any file now + // it('Should fail with an invalid captionfile extension', async function () { + // const attaches = { + // 'captionfile': buildAbsoluteFixturePath('subtitle-bad.txt') + // } + // + // const captionPath = path + video.uuid + '/captions/fr' + // await makeUploadRequest({ + // method: 'PUT', + // url: server.url, + // path: captionPath, + // token: server.accessToken, + // fields, + // attaches, + // expectedStatus: HttpStatusCode.BAD_REQUEST_400 + // }) + // }) + + // We don't check the extension yet + // it('Should fail with an invalid captionfile extension and octet-stream mime type', async function () { + // await createVideoCaption({ + // url: server.url, + // accessToken: server.accessToken, + // language: 'zh', + // videoId: video.uuid, + // fixture: 'subtitle-bad.txt', + // mimeType: 'application/octet-stream', + // expectedStatus: HttpStatusCode.BAD_REQUEST_400 + // }) + // }) + + it('Should succeed with a valid captionfile extension and octet-stream mime type', async function () { + await server.captions.add({ + language: 'zh', + videoId: video.uuid, + fixture: 'subtitle-good.srt', + mimeType: 'application/octet-stream' + }) + }) + + // We don't check the file validity yet + // it('Should fail with an invalid captionfile srt', async function () { + // const attaches = { + // 'captionfile': buildAbsoluteFixturePath('subtitle-bad.srt') + // } + // + // const captionPath = path + video.uuid + '/captions/fr' + // await makeUploadRequest({ + // method: 'PUT', + // url: server.url, + // path: captionPath, + // token: server.accessToken, + // fields, + // attaches, + // expectedStatus: HttpStatusCode.INTERNAL_SERVER_ERROR_500 + // }) + // }) + it('Should success with the correct parameters', async function () { - const captionPath = path + videoUUID + '/captions/fr' + const captionPath = path + video.uuid + '/captions/fr' await makeUploadRequest({ method: 'PUT', url: server.url, @@ -136,7 +187,7 @@ describe('Test video captions API validator', function () { token: server.accessToken, fields, attaches, - statusCodeExpected: 204 + expectedStatus: HttpStatusCode.NO_CONTENT_204 }) }) }) @@ -147,11 +198,39 @@ describe('Test video captions API validator', function () { }) it('Should fail with an unknown id', async function () { - await makeGetRequest({ url: server.url, path: path + '4da6fde3-88f7-4d16-b119-108df5630b06/captions', statusCodeExpected: 404 }) + await makeGetRequest({ + url: server.url, + path: path + '4da6fde3-88f7-4d16-b119-108df5630b06/captions', + expectedStatus: HttpStatusCode.NOT_FOUND_404 + }) + }) + + it('Should fail with a private video without token', async function () { + await makeGetRequest({ + url: server.url, + path: path + privateVideo.shortUUID + '/captions', + expectedStatus: HttpStatusCode.UNAUTHORIZED_401 + }) + }) + + it('Should fail with another user token', async function () { + await makeGetRequest({ + url: server.url, + token: userAccessToken, + path: path + privateVideo.shortUUID + '/captions', + expectedStatus: HttpStatusCode.FORBIDDEN_403 + }) }) it('Should success with the correct parameters', async function () { - await makeGetRequest({ url: server.url, path: path + videoUUID + '/captions', statusCodeExpected: 200 }) + await makeGetRequest({ url: server.url, path: path + video.shortUUID + '/captions', expectedStatus: HttpStatusCode.OK_200 }) + + await makeGetRequest({ + url: server.url, + path: path + privateVideo.shortUUID + '/captions', + token: server.accessToken, + expectedStatus: HttpStatusCode.OK_200 + }) }) }) @@ -169,7 +248,7 @@ describe('Test video captions API validator', function () { url: server.url, path: path + '4da6fde3-88f7-4d16-b119-108df5630b06/captions/fr', token: server.accessToken, - statusCodeExpected: 404 + expectedStatus: HttpStatusCode.NOT_FOUND_404 }) }) @@ -182,42 +261,47 @@ describe('Test video captions API validator', function () { }) it('Should fail with a missing language', async function () { - const captionPath = path + videoUUID + '/captions' + const captionPath = path + video.shortUUID + '/captions' await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken }) }) it('Should fail with an unknown language', async function () { - const captionPath = path + videoUUID + '/captions/15' + const captionPath = path + video.shortUUID + '/captions/15' await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken }) }) it('Should fail without access token', async function () { - const captionPath = path + videoUUID + '/captions/fr' - await makeDeleteRequest({ url: server.url, path: captionPath, statusCodeExpected: 401 }) + const captionPath = path + video.shortUUID + '/captions/fr' + await makeDeleteRequest({ url: server.url, path: captionPath, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) }) it('Should fail with a bad access token', async function () { - const captionPath = path + videoUUID + '/captions/fr' - await makeDeleteRequest({ url: server.url, path: captionPath, token: 'coucou', statusCodeExpected: 401 }) + const captionPath = path + video.shortUUID + '/captions/fr' + await makeDeleteRequest({ url: server.url, path: captionPath, token: 'coucou', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) }) it('Should fail with another user', async function () { - const captionPath = path + videoUUID + '/captions/fr' - await makeDeleteRequest({ url: server.url, path: captionPath, token: userAccessToken, statusCodeExpected: 403 }) + const captionPath = path + video.shortUUID + '/captions/fr' + await makeDeleteRequest({ + url: server.url, + path: captionPath, + token: userAccessToken, + expectedStatus: HttpStatusCode.FORBIDDEN_403 + }) }) it('Should success with the correct parameters', async function () { - const captionPath = path + videoUUID + '/captions/fr' - await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken, statusCodeExpected: 204 }) + const captionPath = path + video.shortUUID + '/captions/fr' + await makeDeleteRequest({ + url: server.url, + path: captionPath, + token: server.accessToken, + expectedStatus: HttpStatusCode.NO_CONTENT_204 + }) }) }) after(async function () { - killallServers([ server ]) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests([ server ]) }) })