From 213e30ef90806369529684ac9c247d73b8dc7928 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 7 Apr 2021 10:36:13 +0200 Subject: Add banner tests --- shared/extra-utils/requests/requests.ts | 7 ++++--- shared/extra-utils/users/users.ts | 4 ++-- shared/extra-utils/videos/video-channels.ts | 29 +++++++++++++++++++++++------ 3 files changed, 29 insertions(+), 11 deletions(-) (limited to 'shared') diff --git a/shared/extra-utils/requests/requests.ts b/shared/extra-utils/requests/requests.ts index 3e773ee03..8b5cddf4a 100644 --- a/shared/extra-utils/requests/requests.ts +++ b/shared/extra-utils/requests/requests.ts @@ -152,11 +152,12 @@ function makeHTMLRequest (url: string, path: string) { .expect(HttpStatusCode.OK_200) } -function updateAvatarRequest (options: { +function updateImageRequest (options: { url: string path: string accessToken: string fixture: string + fieldname: string }) { let filePath = '' if (isAbsolute(options.fixture)) { @@ -170,7 +171,7 @@ function updateAvatarRequest (options: { path: options.path, token: options.accessToken, fields: {}, - attaches: { avatarfile: filePath }, + attaches: { [options.fieldname]: filePath }, statusCodeExpected: HttpStatusCode.OK_200 }) } @@ -191,5 +192,5 @@ export { makePutBodyRequest, makeDeleteRequest, makeRawRequest, - updateAvatarRequest + updateImageRequest } diff --git a/shared/extra-utils/users/users.ts b/shared/extra-utils/users/users.ts index db532dbb0..6040dd9c0 100644 --- a/shared/extra-utils/users/users.ts +++ b/shared/extra-utils/users/users.ts @@ -4,7 +4,7 @@ import { UserUpdateMe } from '../../models/users' import { UserAdminFlag } from '../../models/users/user-flag.model' import { UserRegister } from '../../models/users/user-register.model' import { UserRole } from '../../models/users/user-role' -import { makeGetRequest, makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests' +import { makeGetRequest, makePostBodyRequest, makePutBodyRequest, updateImageRequest } from '../requests/requests' import { ServerInfo } from '../server/servers' import { userLogin } from './login' import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' @@ -275,7 +275,7 @@ function updateMyAvatar (options: { }) { const path = '/api/v1/users/me/avatar/pick' - return updateAvatarRequest(Object.assign(options, { path })) + return updateImageRequest({ ...options, path, fieldname: 'avatarfile' }) } function updateUser (options: { diff --git a/shared/extra-utils/videos/video-channels.ts b/shared/extra-utils/videos/video-channels.ts index 3ff445c2a..d0dfb5856 100644 --- a/shared/extra-utils/videos/video-channels.ts +++ b/shared/extra-utils/videos/video-channels.ts @@ -3,7 +3,7 @@ import * as request from 'supertest' import { VideoChannelUpdate } from '../../models/videos/channel/video-channel-update.model' import { VideoChannelCreate } from '../../models/videos/channel/video-channel-create.model' -import { makeGetRequest, updateAvatarRequest } from '../requests/requests' +import { makeDeleteRequest, makeGetRequest, updateImageRequest } from '../requests/requests' import { ServerInfo } from '../server/servers' import { User } from '../../models/users/user.model' import { getMyUserInformation } from '../users/users' @@ -129,16 +129,32 @@ function getVideoChannel (url: string, channelName: string) { .expect('Content-Type', /json/) } -function updateVideoChannelAvatar (options: { +function updateVideoChannelImage (options: { url: string accessToken: string fixture: string videoChannelName: string | number + type: 'avatar' | 'banner' }) { + const path = `/api/v1/video-channels/${options.videoChannelName}/${options.type}/pick` - const path = '/api/v1/video-channels/' + options.videoChannelName + '/avatar/pick' + return updateImageRequest({ ...options, path, fieldname: options.type + 'file' }) +} + +function deleteVideoChannelImage (options: { + url: string + accessToken: string + videoChannelName: string | number + type: 'avatar' | 'banner' +}) { + const path = `/api/v1/video-channels/${options.videoChannelName}/${options.type}` - return updateAvatarRequest(Object.assign(options, { path })) + return makeDeleteRequest({ + url: options.url, + token: options.accessToken, + path, + statusCodeExpected: 204 + }) } function setDefaultVideoChannel (servers: ServerInfo[]) { @@ -157,12 +173,13 @@ function setDefaultVideoChannel (servers: ServerInfo[]) { // --------------------------------------------------------------------------- export { - updateVideoChannelAvatar, + updateVideoChannelImage, getVideoChannelsList, getAccountVideoChannelsList, addVideoChannel, updateVideoChannel, deleteVideoChannel, getVideoChannel, - setDefaultVideoChannel + setDefaultVideoChannel, + deleteVideoChannelImage } -- cgit v1.2.3