/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
import * as chai from 'chai'
import { orderBy } from 'lodash'
-import 'mocha'
import {
addVideoToBlacklist,
cleanupTests,
} from '../../../../shared/extra-utils/index'
import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { VideoBlocklist, VideoBlockType } from '../../../../shared/models/videos'
-import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
+import { getGoodVideoUrl, getMagnetURI, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
import { User, UserRole } from '../../../../shared/models/users'
-import { getMagnetURI, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
+import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
+import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos'
const expect = chai.expect
const res = await getBlacklistedVideosList({
url: servers[0].url,
token: servers[0].accessToken,
- type: VideoBlockType.MANUAL
+ type: VideoBlacklistType.MANUAL
})
expect(res.body.total).to.equal(2)
const res = await getBlacklistedVideosList({
url: servers[0].url,
token: servers[0].accessToken,
- type: VideoBlockType.AUTO_BEFORE_PUBLISHED
+ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
})
expect(res.body.total).to.equal(0)
})
describe('When removing a blacklisted video', function () {
- let videoToRemove: VideoBlocklist
+ let videoToRemove: VideoBlacklist
let blacklist = []
it('Should not have any video in videos list on server 1', async function () {
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 blacklistedVideos: VideoBlocklist[] = res.body.data
+ const blacklistedVideos: VideoBlacklist[] = res.body.data
const video3Blacklisted = blacklistedVideos.find(b => b.video.uuid === video3UUID)
const video4Blacklisted = blacklistedVideos.find(b => b.video.uuid === video4UUID)
url: servers[0].url,
accessToken: servers[0].accessToken,
username: user.username,
- adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK,
+ adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST,
password: user.password,
role: UserRole.USER
})
const res = await getBlacklistedVideosList({
url: servers[0].url,
token: servers[0].accessToken,
- type: VideoBlockType.AUTO_BEFORE_PUBLISHED
+ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
})
expect(res.body.total).to.equal(1)
this.timeout(15000)
const attributes = {
- targetUrl: getYoutubeVideoUrl(),
+ targetUrl: getGoodVideoUrl(),
name: 'URL import',
channelId: channelOfUserWithoutFlag
}
url: servers[0].url,
token: servers[0].accessToken,
sort: 'createdAt',
- type: VideoBlockType.AUTO_BEFORE_PUBLISHED
+ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
})
expect(res.body.total).to.equal(2)
url: servers[0].url,
token: servers[0].accessToken,
sort: 'createdAt',
- type: VideoBlockType.AUTO_BEFORE_PUBLISHED
+ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
})
expect(res.body.total).to.equal(3)
const res = await getBlacklistedVideosList({
url: servers[0].url,
token: servers[0].accessToken,
- type: VideoBlockType.AUTO_BEFORE_PUBLISHED
+ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
})
expect(res.body.total).to.equal(3)