-/* tslint:disable:no-unused-expression */
-
-import 'mocha'
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import { expect } from 'chai'
+import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '@server/tests/shared'
+import { HttpStatusCode, VideoBlacklistType } from '@shared/models'
import {
+ BlacklistCommand,
cleanupTests,
- createUser,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
- flushTests,
- getBlacklistedVideosList,
- getVideo,
- getVideoWithToken,
- killallServers,
makePostBodyRequest,
makePutBodyRequest,
- removeVideoFromBlacklist,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
- uploadVideo,
- userLogin, waitJobs
-} from '../../../../shared/extra-utils'
-import {
- checkBadCountPagination,
- checkBadSortPagination,
- checkBadStartPagination
-} from '../../../../shared/extra-utils/requests/check-api-params'
-import { VideoDetails, VideoBlacklistType } from '../../../../shared/models/videos'
-import { expect } from 'chai'
+ waitJobs
+} from '@shared/server-commands'
describe('Test video blacklist API validators', function () {
- let servers: ServerInfo[]
- let notBlacklistedVideoId: number
+ let servers: PeerTubeServer[]
+ let notBlacklistedVideoId: string
let remoteVideoUUID: string
let userAccessToken1 = ''
let userAccessToken2 = ''
+ let command: BlacklistCommand
// ---------------------------------------------------------------
before(async function () {
this.timeout(120000)
- servers = await flushAndRunMultipleServers(2)
+ servers = await createMultipleServers(2)
await setAccessTokensToServers(servers)
await doubleFollow(servers[0], servers[1])
{
const username = 'user1'
const password = 'my super password'
- await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: username, password: password })
- userAccessToken1 = await userLogin(servers[0], { username, password })
+ await servers[0].users.create({ username, password })
+ userAccessToken1 = await servers[0].login.getAccessToken({ username, password })
}
{
const username = 'user2'
const password = 'my super password'
- await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: username, password: password })
- userAccessToken2 = await userLogin(servers[0], { username, password })
+ await servers[0].users.create({ username, password })
+ userAccessToken2 = await servers[0].login.getAccessToken({ username, password })
}
{
- const res = await uploadVideo(servers[0].url, userAccessToken1, {})
- servers[0].video = res.body.video
+ servers[0].store.videoCreated = await servers[0].videos.upload({ token: userAccessToken1 })
}
{
- const res = await uploadVideo(servers[0].url, servers[0].accessToken, {})
- notBlacklistedVideoId = res.body.video.uuid
+ const { uuid } = await servers[0].videos.upload()
+ notBlacklistedVideoId = uuid
}
{
- const res = await uploadVideo(servers[1].url, servers[1].accessToken, {})
- remoteVideoUUID = res.body.video.uuid
+ const { uuid } = await servers[1].videos.upload()
+ remoteVideoUUID = uuid
}
await waitJobs(servers)
+
+ command = servers[0].blacklist
})
describe('When adding a video in blacklist', function () {
const basePath = '/api/v1/videos/'
it('Should fail with nothing', async function () {
- const path = basePath + servers[0].video + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated + '/blacklist'
const fields = {}
await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields })
})
})
it('Should fail with a non authenticated user', async function () {
- const path = basePath + servers[0].video + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated + '/blacklist'
const fields = {}
- await makePostBodyRequest({ url: servers[0].url, path, token: 'hello', fields, statusCodeExpected: 401 })
+ await makePostBodyRequest({ url: servers[0].url, path, token: 'hello', fields, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with a non admin user', async function () {
- const path = basePath + servers[0].video + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated + '/blacklist'
const fields = {}
- await makePostBodyRequest({ url: servers[0].url, path, token: userAccessToken2, fields, statusCodeExpected: 403 })
+ await makePostBodyRequest({
+ url: servers[0].url,
+ path,
+ token: userAccessToken2,
+ fields,
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
+ })
})
it('Should fail with an invalid reason', async function () {
- const path = basePath + servers[0].video.uuid + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated.uuid + '/blacklist'
const fields = { reason: 'a'.repeat(305) }
await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields })
const path = basePath + remoteVideoUUID + '/blacklist'
const fields = { unfederate: true }
- await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 409 })
+ await makePostBodyRequest({
+ url: servers[0].url,
+ path,
+ token: servers[0].accessToken,
+ fields,
+ expectedStatus: HttpStatusCode.CONFLICT_409
+ })
})
it('Should succeed with the correct params', async function () {
- const path = basePath + servers[0].video.uuid + '/blacklist'
- const fields = { }
+ const path = basePath + servers[0].store.videoCreated.uuid + '/blacklist'
+ const fields = {}
- await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 204 })
+ await makePostBodyRequest({
+ url: servers[0].url,
+ path,
+ token: servers[0].accessToken,
+ fields,
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
+ })
})
})
it('Should fail with a video not blacklisted', async function () {
const path = '/api/v1/videos/' + notBlacklistedVideoId + '/blacklist'
const fields = {}
- await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 404 })
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path,
+ token: servers[0].accessToken,
+ fields,
+ expectedStatus: HttpStatusCode.NOT_FOUND_404
+ })
})
it('Should fail with a non authenticated user', async function () {
- const path = basePath + servers[0].video + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated + '/blacklist'
const fields = {}
- await makePutBodyRequest({ url: servers[0].url, path, token: 'hello', fields, statusCodeExpected: 401 })
+ await makePutBodyRequest({ url: servers[0].url, path, token: 'hello', fields, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with a non admin user', async function () {
- const path = basePath + servers[0].video + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated + '/blacklist'
const fields = {}
- await makePutBodyRequest({ url: servers[0].url, path, token: userAccessToken2, fields, statusCodeExpected: 403 })
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path,
+ token: userAccessToken2,
+ fields,
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
+ })
})
it('Should fail with an invalid reason', async function () {
- const path = basePath + servers[0].video.uuid + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated.uuid + '/blacklist'
const fields = { reason: 'a'.repeat(305) }
await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields })
})
it('Should succeed with the correct params', async function () {
- const path = basePath + servers[0].video.uuid + '/blacklist'
+ const path = basePath + servers[0].store.videoCreated.shortUUID + '/blacklist'
const fields = { reason: 'hello' }
- await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 204 })
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path,
+ token: servers[0].accessToken,
+ fields,
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
+ })
})
})
describe('When getting blacklisted video', function () {
it('Should fail with a non authenticated user', async function () {
- await getVideo(servers[0].url, servers[0].video.uuid, 401)
+ await servers[0].videos.get({ id: servers[0].store.videoCreated.uuid, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with another user', async function () {
- await getVideoWithToken(servers[0].url, userAccessToken2, servers[0].video.uuid, 403)
+ await servers[0].videos.getWithToken({
+ token: userAccessToken2,
+ id: servers[0].store.videoCreated.uuid,
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
+ })
})
it('Should succeed with the owner authenticated user', async function () {
- const res = await getVideoWithToken(servers[0].url, userAccessToken1, servers[0].video.uuid, 200)
- const video: VideoDetails = res.body
-
+ const video = await servers[0].videos.getWithToken({ token: userAccessToken1, id: servers[0].store.videoCreated.uuid })
expect(video.blacklisted).to.be.true
})
it('Should succeed with an admin', async function () {
- const res = await getVideoWithToken(servers[0].url, servers[0].accessToken, servers[0].video.uuid, 200)
- const video: VideoDetails = res.body
+ const video = servers[0].store.videoCreated
- expect(video.blacklisted).to.be.true
+ for (const id of [ video.id, video.uuid, video.shortUUID ]) {
+ const video = await servers[0].videos.getWithToken({ id, expectedStatus: HttpStatusCode.OK_200 })
+ expect(video.blacklisted).to.be.true
+ }
})
})
describe('When removing a video in blacklist', function () {
+
it('Should fail with a non authenticated user', async function () {
- await removeVideoFromBlacklist(servers[0].url, 'fake token', servers[0].video.uuid, 401)
+ await command.remove({
+ token: 'fake token',
+ videoId: servers[0].store.videoCreated.uuid,
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
+ })
})
it('Should fail with a non admin user', async function () {
- await removeVideoFromBlacklist(servers[0].url, userAccessToken2, servers[0].video.uuid, 403)
+ await command.remove({
+ token: userAccessToken2,
+ videoId: servers[0].store.videoCreated.uuid,
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
+ })
})
it('Should fail with an incorrect id', async function () {
- await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, 'hello', 400)
+ await command.remove({ videoId: 'hello', expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should fail with a not blacklisted video', async function () {
// The video was not added to the blacklist so it should fail
- await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, notBlacklistedVideoId, 404)
+ await command.remove({ videoId: notBlacklistedVideoId, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
it('Should succeed with the correct params', async function () {
- await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, servers[0].video.uuid, 204)
+ await command.remove({ videoId: servers[0].store.videoCreated.uuid, expectedStatus: HttpStatusCode.NO_CONTENT_204 })
})
})
const basePath = '/api/v1/videos/blacklist/'
it('Should fail with a non authenticated user', async function () {
- await getBlacklistedVideosList({ url: servers[0].url, token: 'fake token', specialStatus: 401 })
+ await servers[0].blacklist.list({ token: 'fake token', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with a non admin user', async function () {
- await getBlacklistedVideosList({ url: servers[0].url, token: userAccessToken2, specialStatus: 403 })
+ await servers[0].blacklist.list({ token: userAccessToken2, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should fail with a bad start pagination', async function () {
})
it('Should fail with an invalid type', async function () {
- await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, type: 0, specialStatus: 400 })
+ await servers[0].blacklist.list({ type: 0 as any, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should succeed with the correct parameters', async function () {
- await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, type: VideoBlacklistType.MANUAL })
+ await servers[0].blacklist.list({ type: VideoBlacklistType.MANUAL })
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff