/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import 'mocha'
-import * as chai from 'chai'
-import { orderBy } from 'lodash'
+import { expect } from 'chai'
+import { FIXTURE_URLS } from '@server/tests/shared'
+import { sortObjectComparator } from '@shared/core-utils'
+import { UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models'
import {
- addVideoToBlacklist,
+ BlacklistCommand,
cleanupTests,
- createUser,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
- getBlacklistedVideosList,
- getMyUserInformation,
- getMyVideos,
- getVideosList,
killallServers,
- removeVideoFromBlacklist,
- reRunServer,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
- updateVideo,
- updateVideoBlacklist,
- uploadVideo,
- userLogin,
+ setDefaultChannelAvatar,
waitJobs
-} from '@shared/extra-utils'
-import { getGoodVideoUrl, getMagnetURI, importVideo } from '@shared/extra-utils/videos/video-imports'
-import { User, UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models'
-
-const expect = chai.expect
+} from '@shared/server-commands'
describe('Test video blacklist', function () {
- let servers: ServerInfo[] = []
+ let servers: PeerTubeServer[] = []
let videoId: number
+ let command: BlacklistCommand
- async function blacklistVideosOnServer (server: ServerInfo) {
- const res = await getVideosList(server.url)
+ async function blacklistVideosOnServer (server: PeerTubeServer) {
+ const { data } = await server.videos.list()
- const videos = res.body.data
- for (const video of videos) {
- await addVideoToBlacklist(server.url, server.accessToken, video.id, 'super reason')
+ for (const video of data) {
+ await server.blacklist.add({ videoId: video.id, reason: 'super reason' })
}
}
before(async function () {
- this.timeout(50000)
+ this.timeout(120000)
// Run servers
- servers = await flushAndRunMultipleServers(2)
+ servers = await createMultipleServers(2)
// Get the access tokens
await setAccessTokensToServers(servers)
// Server 1 and server 2 follow each other
await doubleFollow(servers[0], servers[1])
+ await setDefaultChannelAvatar(servers[0])
// Upload 2 videos on server 2
- await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 1st video', description: 'A video on server 2' })
- await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' })
+ await servers[1].videos.upload({ attributes: { name: 'My 1st video', description: 'A video on server 2' } })
+ await servers[1].videos.upload({ attributes: { name: 'My 2nd video', description: 'A video on server 2' } })
// Wait videos propagation, server 2 has transcoding enabled
await waitJobs(servers)
+ command = servers[0].blacklist
+
// Blacklist the two videos on server 1
await blacklistVideosOnServer(servers[0])
})
it('Should not have the video blacklisted in videos list/search on server 1', async function () {
{
- const res = await getVideosList(servers[0].url)
+ const { total, data } = await servers[0].videos.list()
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data.length).to.equal(0)
+ expect(total).to.equal(0)
+ expect(data).to.be.an('array')
+ expect(data.length).to.equal(0)
}
{
- const body = await servers[0].searchCommand.searchVideos({ search: 'name' })
+ const body = await servers[0].search.searchVideos({ search: 'video' })
expect(body.total).to.equal(0)
expect(body.data).to.be.an('array')
it('Should have the blacklisted video in videos list/search on server 2', async function () {
{
- const res = await getVideosList(servers[1].url)
+ const { total, data } = await servers[1].videos.list()
- expect(res.body.total).to.equal(2)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data.length).to.equal(2)
+ expect(total).to.equal(2)
+ expect(data).to.be.an('array')
+ expect(data.length).to.equal(2)
}
{
- const body = await servers[1].searchCommand.searchVideos({ search: 'name' })
+ const body = await servers[1].search.searchVideos({ search: 'video' })
expect(body.total).to.equal(2)
expect(body.data).to.be.an('array')
describe('When listing manually blacklisted videos', function () {
it('Should display all the blacklisted videos', async function () {
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken })
-
- expect(res.body.total).to.equal(2)
+ const body = await command.list()
+ expect(body.total).to.equal(2)
- const blacklistedVideos = res.body.data
+ const blacklistedVideos = body.data
expect(blacklistedVideos).to.be.an('array')
expect(blacklistedVideos.length).to.equal(2)
})
it('Should display all the blacklisted videos when applying manual type filter', async function () {
- const res = await getBlacklistedVideosList({
- url: servers[0].url,
- token: servers[0].accessToken,
- type: VideoBlacklistType.MANUAL
- })
+ const body = await command.list({ type: VideoBlacklistType.MANUAL })
+ expect(body.total).to.equal(2)
- expect(res.body.total).to.equal(2)
-
- const blacklistedVideos = res.body.data
+ const blacklistedVideos = body.data
expect(blacklistedVideos).to.be.an('array')
expect(blacklistedVideos.length).to.equal(2)
})
it('Should display nothing when applying automatic type filter', async function () {
- const res = await getBlacklistedVideosList({
- url: servers[0].url,
- token: servers[0].accessToken,
- type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
- })
-
- expect(res.body.total).to.equal(0)
+ const body = await command.list({ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED })
+ expect(body.total).to.equal(0)
- const blacklistedVideos = res.body.data
+ const blacklistedVideos = body.data
expect(blacklistedVideos).to.be.an('array')
expect(blacklistedVideos.length).to.equal(0)
})
it('Should get the correct sort when sorting by descending id', async function () {
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-id' })
- expect(res.body.total).to.equal(2)
+ const body = await command.list({ sort: '-id' })
+ expect(body.total).to.equal(2)
- const blacklistedVideos = res.body.data
+ const blacklistedVideos = body.data
expect(blacklistedVideos).to.be.an('array')
expect(blacklistedVideos.length).to.equal(2)
- const result = orderBy(res.body.data, [ 'id' ], [ 'desc' ])
-
+ const result = [ ...body.data ].sort(sortObjectComparator('id', 'desc'))
expect(blacklistedVideos).to.deep.equal(result)
})
it('Should get the correct sort when sorting by descending video name', async function () {
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
- expect(res.body.total).to.equal(2)
+ const body = await command.list({ sort: '-name' })
+ expect(body.total).to.equal(2)
- const blacklistedVideos = res.body.data
+ const blacklistedVideos = body.data
expect(blacklistedVideos).to.be.an('array')
expect(blacklistedVideos.length).to.equal(2)
- const result = orderBy(res.body.data, [ 'name' ], [ 'desc' ])
-
+ const result = [ ...body.data ].sort(sortObjectComparator('name', 'desc'))
expect(blacklistedVideos).to.deep.equal(result)
})
it('Should get the correct sort when sorting by ascending creation date', async function () {
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt' })
- expect(res.body.total).to.equal(2)
+ const body = await command.list({ sort: 'createdAt' })
+ expect(body.total).to.equal(2)
- const blacklistedVideos = res.body.data
+ const blacklistedVideos = body.data
expect(blacklistedVideos).to.be.an('array')
expect(blacklistedVideos.length).to.equal(2)
- const result = orderBy(res.body.data, [ 'createdAt' ])
-
+ const result = [ ...body.data ].sort(sortObjectComparator('createdAt', 'asc'))
expect(blacklistedVideos).to.deep.equal(result)
})
})
describe('When updating blacklisted videos', function () {
it('Should change the reason', async function () {
- await updateVideoBlacklist(servers[0].url, servers[0].accessToken, videoId, 'my super reason updated')
+ await command.update({ videoId, reason: 'my super reason updated' })
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
- const video = res.body.data.find(b => b.video.id === videoId)
+ const body = await command.list({ sort: '-name' })
+ const video = body.data.find(b => b.video.id === videoId)
expect(video.reason).to.equal('my super reason updated')
})
it('Should display blacklisted videos', async function () {
await blacklistVideosOnServer(servers[1])
- const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 5)
+ const { total, data } = await servers[1].videos.listMyVideos()
- expect(res.body.total).to.equal(2)
- expect(res.body.data).to.have.lengthOf(2)
+ expect(total).to.equal(2)
+ expect(data).to.have.lengthOf(2)
- for (const video of res.body.data) {
+ for (const video of data) {
expect(video.blacklisted).to.be.true
expect(video.blacklistedReason).to.equal('super reason')
}
let blacklist = []
it('Should not have any video in videos list on server 1', async function () {
- const res = await getVideosList(servers[0].url)
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data.length).to.equal(0)
+ const { total, data } = await servers[0].videos.list()
+ expect(total).to.equal(0)
+ expect(data).to.be.an('array')
+ expect(data.length).to.equal(0)
})
it('Should remove a video from the blacklist on server 1', async function () {
// Get one video in the blacklist
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
- videoToRemove = res.body.data[0]
- blacklist = res.body.data.slice(1)
+ const body = await command.list({ sort: '-name' })
+ videoToRemove = body.data[0]
+ blacklist = body.data.slice(1)
// Remove it
- await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, videoToRemove.video.id)
+ await command.remove({ videoId: videoToRemove.video.id })
})
it('Should have the ex-blacklisted video in videos list on server 1', async function () {
- const res = await getVideosList(servers[0].url)
- expect(res.body.total).to.equal(1)
+ const { total, data } = await servers[0].videos.list()
+ expect(total).to.equal(1)
- const videos = res.body.data
- expect(videos).to.be.an('array')
- expect(videos.length).to.equal(1)
+ expect(data).to.be.an('array')
+ expect(data.length).to.equal(1)
- expect(videos[0].name).to.equal(videoToRemove.video.name)
- expect(videos[0].id).to.equal(videoToRemove.video.id)
+ expect(data[0].name).to.equal(videoToRemove.video.name)
+ expect(data[0].id).to.equal(videoToRemove.video.id)
})
it('Should not have the ex-blacklisted video in videos blacklist list on server 1', async function () {
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
- expect(res.body.total).to.equal(1)
+ const body = await command.list({ sort: '-name' })
+ expect(body.total).to.equal(1)
- const videos = res.body.data
+ const videos = body.data
expect(videos).to.be.an('array')
expect(videos.length).to.equal(1)
expect(videos).to.deep.equal(blacklist)
let video4UUID: string
before(async function () {
- this.timeout(10000)
-
{
- const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'Video 3' })
- video3UUID = res.body.video.uuid
+ const { uuid } = await servers[0].videos.upload({ attributes: { name: 'Video 3' } })
+ video3UUID = uuid
}
{
- const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'Video 4' })
- video4UUID = res.body.video.uuid
+ const { uuid } = await servers[0].videos.upload({ attributes: { name: 'Video 4' } })
+ video4UUID = uuid
}
await waitJobs(servers)
})
it('Should blacklist video 3 and keep it federated', async function () {
- this.timeout(10000)
-
- await addVideoToBlacklist(servers[0].url, servers[0].accessToken, video3UUID, 'super reason', false)
+ await command.add({ videoId: video3UUID, reason: 'super reason', unfederate: false })
await waitJobs(servers)
{
- const res = await getVideosList(servers[0].url)
- expect(res.body.data.find(v => v.uuid === video3UUID)).to.be.undefined
+ const { data } = await servers[0].videos.list()
+ expect(data.find(v => v.uuid === video3UUID)).to.be.undefined
}
{
- const res = await getVideosList(servers[1].url)
- expect(res.body.data.find(v => v.uuid === video3UUID)).to.not.be.undefined
+ const { data } = await servers[1].videos.list()
+ expect(data.find(v => v.uuid === video3UUID)).to.not.be.undefined
}
})
it('Should unfederate the video', async function () {
- this.timeout(10000)
-
- await addVideoToBlacklist(servers[0].url, servers[0].accessToken, video4UUID, 'super reason', true)
+ await command.add({ videoId: video4UUID, reason: 'super reason', unfederate: true })
await waitJobs(servers)
for (const server of servers) {
- const res = await getVideosList(server.url)
- expect(res.body.data.find(v => v.uuid === video4UUID)).to.be.undefined
+ const { data } = await server.videos.list()
+ expect(data.find(v => v.uuid === video4UUID)).to.be.undefined
}
})
it('Should have the video unfederated even after an Update AP message', async function () {
- this.timeout(10000)
-
- await updateVideo(servers[0].url, servers[0].accessToken, video4UUID, { description: 'super description' })
+ await servers[0].videos.update({ id: video4UUID, attributes: { description: 'super description' } })
await waitJobs(servers)
for (const server of servers) {
- const res = await getVideosList(server.url)
- expect(res.body.data.find(v => v.uuid === video4UUID)).to.be.undefined
+ const { data } = await server.videos.list()
+ expect(data.find(v => v.uuid === video4UUID)).to.be.undefined
}
})
it('Should have the correct video blacklist unfederate attribute', async function () {
- const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt' })
+ const body = await command.list({ sort: 'createdAt' })
- const blacklistedVideos: VideoBlacklist[] = res.body.data
+ const blacklistedVideos = body.data
const video3Blacklisted = blacklistedVideos.find(b => b.video.uuid === video3UUID)
const video4Blacklisted = blacklistedVideos.find(b => b.video.uuid === video4UUID)
})
it('Should remove the video from blacklist and refederate the video', async function () {
- this.timeout(10000)
-
- await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, video4UUID)
+ await command.remove({ videoId: video4UUID })
await waitJobs(servers)
for (const server of servers) {
- const res = await getVideosList(server.url)
- expect(res.body.data.find(v => v.uuid === video4UUID)).to.not.be.undefined
+ const { data } = await server.videos.list()
+ expect(data.find(v => v.uuid === video4UUID)).to.not.be.undefined
}
})
before(async function () {
this.timeout(20000)
- killallServers([ servers[0] ])
+ await killallServers([ servers[0] ])
const config = {
auto_blacklist: {
}
}
}
- await reRunServer(servers[0], config)
+ await servers[0].run(config)
{
const user = { username: 'user_without_flag', password: 'password' }
- await createUser({
- url: servers[0].url,
- accessToken: servers[0].accessToken,
+ await servers[0].users.create({
username: user.username,
adminFlags: UserAdminFlag.NONE,
password: user.password,
role: UserRole.USER
})
- userWithoutFlag = await userLogin(servers[0], user)
+ userWithoutFlag = await servers[0].login.getAccessToken(user)
- const res = await getMyUserInformation(servers[0].url, userWithoutFlag)
- const body: User = res.body
- channelOfUserWithoutFlag = body.videoChannels[0].id
+ const { videoChannels } = await servers[0].users.getMyInfo({ token: userWithoutFlag })
+ channelOfUserWithoutFlag = videoChannels[0].id
}
{
const user = { username: 'user_with_flag', password: 'password' }
- await createUser({
- url: servers[0].url,
- accessToken: servers[0].accessToken,
+ await servers[0].users.create({
username: user.username,
adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST,
password: user.password,
role: UserRole.USER
})
- userWithFlag = await userLogin(servers[0], user)
+ userWithFlag = await servers[0].login.getAccessToken(user)
}
await waitJobs(servers)
})
it('Should auto blacklist a video on upload', async function () {
- await uploadVideo(servers[0].url, userWithoutFlag, { name: 'blacklisted' })
+ await servers[0].videos.upload({ token: userWithoutFlag, attributes: { name: 'blacklisted' } })
- const res = await getBlacklistedVideosList({
- url: servers[0].url,
- token: servers[0].accessToken,
- type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
- })
-
- expect(res.body.total).to.equal(1)
- expect(res.body.data[0].video.name).to.equal('blacklisted')
+ const body = await command.list({ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED })
+ expect(body.total).to.equal(1)
+ expect(body.data[0].video.name).to.equal('blacklisted')
})
it('Should auto blacklist a video on URL import', async function () {
this.timeout(15000)
const attributes = {
- targetUrl: getGoodVideoUrl(),
+ targetUrl: FIXTURE_URLS.goodVideo,
name: 'URL import',
channelId: channelOfUserWithoutFlag
}
- await importVideo(servers[0].url, userWithoutFlag, attributes)
-
- const res = await getBlacklistedVideosList({
- url: servers[0].url,
- token: servers[0].accessToken,
- sort: 'createdAt',
- type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
- })
+ await servers[0].imports.importVideo({ token: userWithoutFlag, attributes })
- expect(res.body.total).to.equal(2)
- expect(res.body.data[1].video.name).to.equal('URL import')
+ const body = await command.list({ sort: 'createdAt', type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED })
+ expect(body.total).to.equal(2)
+ expect(body.data[1].video.name).to.equal('URL import')
})
it('Should auto blacklist a video on torrent import', async function () {
const attributes = {
- magnetUri: getMagnetURI(),
+ magnetUri: FIXTURE_URLS.magnet,
name: 'Torrent import',
channelId: channelOfUserWithoutFlag
}
- await importVideo(servers[0].url, userWithoutFlag, attributes)
+ await servers[0].imports.importVideo({ token: userWithoutFlag, attributes })
- const res = await getBlacklistedVideosList({
- url: servers[0].url,
- token: servers[0].accessToken,
- sort: 'createdAt',
- type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
- })
-
- expect(res.body.total).to.equal(3)
- expect(res.body.data[2].video.name).to.equal('Torrent import')
+ const body = await command.list({ sort: 'createdAt', type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED })
+ expect(body.total).to.equal(3)
+ expect(body.data[2].video.name).to.equal('Torrent import')
})
it('Should not auto blacklist a video on upload if the user has the bypass blacklist flag', async function () {
- await uploadVideo(servers[0].url, userWithFlag, { name: 'not blacklisted' })
-
- const res = await getBlacklistedVideosList({
- url: servers[0].url,
- token: servers[0].accessToken,
- type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
- })
+ await servers[0].videos.upload({ token: userWithFlag, attributes: { name: 'not blacklisted' } })
- expect(res.body.total).to.equal(3)
+ const body = await command.list({ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED })
+ expect(body.total).to.equal(3)
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff