/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import 'mocha'
-import { buildUUID } from '@server/helpers/uuid'
import {
checkAbuseStateChange,
checkAutoInstanceFollowing,
checkUserRegistered,
checkVideoAutoBlacklistForModerators,
checkVideoIsPublished,
- cleanupTests,
- getVideoIdFromUUID,
MockInstancesIndex,
MockSmtpServer,
- prepareNotificationsTest,
- ServerInfo,
- uploadVideo,
- wait,
- waitJobs
-} from '@shared/extra-utils'
-import { AbuseState, CustomConfig, UserNotification, VideoPrivacy } from '@shared/models'
+ prepareNotificationsTest
+} from '@server/tests/shared'
+import { wait } from '@shared/core-utils'
+import { buildUUID } from '@shared/extra-utils'
+import { AbuseState, CustomConfig, UserNotification, UserRole, VideoPrivacy } from '@shared/models'
+import { cleanupTests, PeerTubeServer, waitJobs } from '@shared/server-commands'
describe('Test moderation notifications', function () {
- let servers: ServerInfo[] = []
- let userAccessToken: string
+ let servers: PeerTubeServer[] = []
+ let userToken1: string
+ let userToken2: string
+
let userNotifications: UserNotification[] = []
let adminNotifications: UserNotification[] = []
let adminNotificationsServer2: UserNotification[] = []
const res = await prepareNotificationsTest(3)
emails = res.emails
- userAccessToken = res.userAccessToken
+ userToken1 = res.userAccessToken
servers = res.servers
userNotifications = res.userNotifications
adminNotifications = res.adminNotifications
adminNotificationsServer2 = res.adminNotificationsServer2
+
+ userToken2 = await servers[1].users.generateUserAndToken('user2', UserRole.USER)
})
describe('Abuse for moderators notification', function () {
}
})
+ it('Should not send a notification to moderators on local abuse reported by an admin', async function () {
+ this.timeout(20000)
+
+ const name = 'video for abuse ' + buildUUID()
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
+
+ await servers[0].abuses.report({ videoId: video.id, reason: 'super reason' })
+
+ await waitJobs(servers)
+ await checkNewVideoAbuseForModerators({ ...baseParams, shortUUID: video.shortUUID, videoName: name, checkType: 'absence' })
+ })
+
it('Should send a notification to moderators on local video abuse', async function () {
this.timeout(20000)
const name = 'video for abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const video = resVideo.body.video
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
- await servers[0].abusesCommand.report({ videoId: video.id, reason: 'super reason' })
+ await servers[0].abuses.report({ token: userToken1, videoId: video.id, reason: 'super reason' })
await waitJobs(servers)
- await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence')
+ await checkNewVideoAbuseForModerators({ ...baseParams, shortUUID: video.shortUUID, videoName: name, checkType: 'presence' })
})
it('Should send a notification to moderators on remote video abuse', async function () {
this.timeout(20000)
const name = 'video for abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const video = resVideo.body.video
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
await waitJobs(servers)
- const videoId = await getVideoIdFromUUID(servers[1].url, video.uuid)
- await servers[1].abusesCommand.report({ videoId, reason: 'super reason' })
+ const videoId = await servers[1].videos.getId({ uuid: video.uuid })
+ await servers[1].abuses.report({ token: userToken2, videoId, reason: 'super reason' })
await waitJobs(servers)
- await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence')
+ await checkNewVideoAbuseForModerators({ ...baseParams, shortUUID: video.shortUUID, videoName: name, checkType: 'presence' })
})
it('Should send a notification to moderators on local comment abuse', async function () {
this.timeout(20000)
const name = 'video for abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const video = resVideo.body.video
- const comment = await servers[0].commentsCommand.createThread({
- token: userAccessToken,
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
+ const comment = await servers[0].comments.createThread({
+ token: userToken1,
videoId: video.id,
text: 'comment abuse ' + buildUUID()
})
await waitJobs(servers)
- await servers[0].abusesCommand.report({ commentId: comment.id, reason: 'super reason' })
+ await servers[0].abuses.report({ token: userToken1, commentId: comment.id, reason: 'super reason' })
await waitJobs(servers)
- await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence')
+ await checkNewCommentAbuseForModerators({ ...baseParams, shortUUID: video.shortUUID, videoName: name, checkType: 'presence' })
})
it('Should send a notification to moderators on remote comment abuse', async function () {
this.timeout(20000)
const name = 'video for abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const video = resVideo.body.video
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
- await servers[0].commentsCommand.createThread({
- token: userAccessToken,
+ await servers[0].comments.createThread({
+ token: userToken1,
videoId: video.id,
text: 'comment abuse ' + buildUUID()
})
await waitJobs(servers)
- const { data } = await servers[1].commentsCommand.listThreads({ videoId: video.uuid })
+ const { data } = await servers[1].comments.listThreads({ videoId: video.uuid })
const commentId = data[0].id
- await servers[1].abusesCommand.report({ commentId, reason: 'super reason' })
+ await servers[1].abuses.report({ token: userToken2, commentId, reason: 'super reason' })
await waitJobs(servers)
- await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence')
+ await checkNewCommentAbuseForModerators({ ...baseParams, shortUUID: video.shortUUID, videoName: name, checkType: 'presence' })
})
it('Should send a notification to moderators on local account abuse', async function () {
this.timeout(20000)
const username = 'user' + new Date().getTime()
- const { account } = await servers[0].usersCommand.create({ username, password: 'donald' })
+ const { account } = await servers[0].users.create({ username, password: 'donald' })
const accountId = account.id
- await servers[0].abusesCommand.report({ accountId, reason: 'super reason' })
+ await servers[0].abuses.report({ token: userToken1, accountId, reason: 'super reason' })
await waitJobs(servers)
- await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
+ await checkNewAccountAbuseForModerators({ ...baseParams, displayName: username, checkType: 'presence' })
})
it('Should send a notification to moderators on remote account abuse', async function () {
this.timeout(20000)
const username = 'user' + new Date().getTime()
- const tmpToken = await servers[0].usersCommand.generateUserAndToken(username)
- await uploadVideo(servers[0].url, tmpToken, { name: 'super video' })
+ const tmpToken = await servers[0].users.generateUserAndToken(username)
+ await servers[0].videos.upload({ token: tmpToken, attributes: { name: 'super video' } })
await waitJobs(servers)
- const account = await servers[1].accountsCommand.get({ accountName: username + '@' + servers[0].host })
- await servers[1].abusesCommand.report({ accountId: account.id, reason: 'super reason' })
+ const account = await servers[1].accounts.get({ accountName: username + '@' + servers[0].host })
+ await servers[1].abuses.report({ token: userToken2, accountId: account.id, reason: 'super reason' })
await waitJobs(servers)
- await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
+ await checkNewAccountAbuseForModerators({ ...baseParams, displayName: username, checkType: 'presence' })
})
})
server: servers[0],
emails,
socketNotifications: userNotifications,
- token: userAccessToken
+ token: userToken1
}
const name = 'abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const video = resVideo.body.video
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
- const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason' })
+ const body = await servers[0].abuses.report({ token: userToken1, videoId: video.id, reason: 'super reason' })
abuseId = body.abuse.id
})
it('Should send a notification to reporter if the abuse has been accepted', async function () {
this.timeout(10000)
- await servers[0].abusesCommand.update({ abuseId, body: { state: AbuseState.ACCEPTED } })
+ await servers[0].abuses.update({ abuseId, body: { state: AbuseState.ACCEPTED } })
await waitJobs(servers)
- await checkAbuseStateChange(baseParams, abuseId, AbuseState.ACCEPTED, 'presence')
+ await checkAbuseStateChange({ ...baseParams, abuseId, state: AbuseState.ACCEPTED, checkType: 'presence' })
})
it('Should send a notification to reporter if the abuse has been rejected', async function () {
this.timeout(10000)
- await servers[0].abusesCommand.update({ abuseId, body: { state: AbuseState.REJECTED } })
+ await servers[0].abuses.update({ abuseId, body: { state: AbuseState.REJECTED } })
await waitJobs(servers)
- await checkAbuseStateChange(baseParams, abuseId, AbuseState.REJECTED, 'presence')
+ await checkAbuseStateChange({ ...baseParams, abuseId, state: AbuseState.REJECTED, checkType: 'presence' })
})
})
server: servers[0],
emails,
socketNotifications: userNotifications,
- token: userAccessToken
+ token: userToken1
}
baseParamsAdmin = {
}
const name = 'abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const video = resVideo.body.video
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
{
- const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason' })
+ const body = await servers[0].abuses.report({ token: userToken1, videoId: video.id, reason: 'super reason' })
abuseId = body.abuse.id
}
{
- const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason 2' })
+ const body = await servers[0].abuses.report({ token: userToken1, videoId: video.id, reason: 'super reason 2' })
abuseId2 = body.abuse.id
}
})
this.timeout(10000)
const message = 'my super message to users'
- await servers[0].abusesCommand.addMessage({ abuseId, message })
+ await servers[0].abuses.addMessage({ abuseId, message })
await waitJobs(servers)
- await checkNewAbuseMessage(baseParamsUser, abuseId, message, 'user_1@example.com', 'presence')
+ await checkNewAbuseMessage({ ...baseParamsUser, abuseId, message, toEmail: 'user_1@example.com', checkType: 'presence' })
})
it('Should not send a notification to the admin if sent by the admin', async function () {
this.timeout(10000)
const message = 'my super message that should not be sent to the admin'
- await servers[0].abusesCommand.addMessage({ abuseId, message })
+ await servers[0].abuses.addMessage({ abuseId, message })
await waitJobs(servers)
- await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'absence')
+ const toEmail = 'admin' + servers[0].internalServerNumber + '@example.com'
+ await checkNewAbuseMessage({ ...baseParamsAdmin, abuseId, message, toEmail, checkType: 'absence' })
})
it('Should send a notification to moderators', async function () {
this.timeout(10000)
const message = 'my super message to moderators'
- await servers[0].abusesCommand.addMessage({ token: userAccessToken, abuseId: abuseId2, message })
+ await servers[0].abuses.addMessage({ token: userToken1, abuseId: abuseId2, message })
await waitJobs(servers)
- await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'presence')
+ const toEmail = 'admin' + servers[0].internalServerNumber + '@example.com'
+ await checkNewAbuseMessage({ ...baseParamsAdmin, abuseId: abuseId2, message, toEmail, checkType: 'presence' })
})
it('Should not send a notification to reporter if sent by the reporter', async function () {
this.timeout(10000)
const message = 'my super message that should not be sent to reporter'
- await servers[0].abusesCommand.addMessage({ token: userAccessToken, abuseId: abuseId2, message })
+ await servers[0].abuses.addMessage({ token: userToken1, abuseId: abuseId2, message })
await waitJobs(servers)
- await checkNewAbuseMessage(baseParamsUser, abuseId2, message, 'user_1@example.com', 'absence')
+ const toEmail = 'user_1@example.com'
+ await checkNewAbuseMessage({ ...baseParamsUser, abuseId: abuseId2, message, toEmail, checkType: 'absence' })
})
})
server: servers[0],
emails,
socketNotifications: userNotifications,
- token: userAccessToken
+ token: userToken1
}
})
this.timeout(10000)
const name = 'video for abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const uuid = resVideo.body.video.uuid
+ const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
- await servers[0].blacklistCommand.add({ videoId: uuid })
+ await servers[0].blacklist.add({ videoId: uuid })
await waitJobs(servers)
- await checkNewBlacklistOnMyVideo(baseParams, uuid, name, 'blacklist')
+ await checkNewBlacklistOnMyVideo({ ...baseParams, shortUUID, videoName: name, blacklistType: 'blacklist' })
})
it('Should send a notification to video owner on unblacklist', async function () {
this.timeout(10000)
const name = 'video for abuse ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
- const uuid = resVideo.body.video.uuid
+ const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
- await servers[0].blacklistCommand.add({ videoId: uuid })
+ await servers[0].blacklist.add({ videoId: uuid })
await waitJobs(servers)
- await servers[0].blacklistCommand.remove({ videoId: uuid })
+ await servers[0].blacklist.remove({ videoId: uuid })
await waitJobs(servers)
await wait(500)
- await checkNewBlacklistOnMyVideo(baseParams, uuid, name, 'unblacklist')
+ await checkNewBlacklistOnMyVideo({ ...baseParams, shortUUID, videoName: name, blacklistType: 'unblacklist' })
})
})
it('Should send a notification only to moderators when a user registers on the instance', async function () {
this.timeout(10000)
- await servers[0].usersCommand.register({ username: 'user_45' })
+ await servers[0].users.register({ username: 'user_45' })
await waitJobs(servers)
- await checkUserRegistered(baseParams, 'user_45', 'presence')
+ await checkUserRegistered({ ...baseParams, username: 'user_45', checkType: 'presence' })
- const userOverride = { socketNotifications: userNotifications, token: userAccessToken, check: { web: true, mail: false } }
- await checkUserRegistered({ ...baseParams, ...userOverride }, 'user_45', 'absence')
+ const userOverride = { socketNotifications: userNotifications, token: userToken1, check: { web: true, mail: false } }
+ await checkUserRegistered({ ...baseParams, ...userOverride, username: 'user_45', checkType: 'absence' })
})
})
followings: {
instance: {
autoFollowIndex: {
- indexUrl: `http://localhost:${port}/api/v1/instances/hosts`,
+ indexUrl: `http://127.0.0.1:${port}/api/v1/instances/hosts`,
enabled: true
}
}
})
it('Should send a notification only to admin when there is a new instance follower', async function () {
- this.timeout(20000)
+ this.timeout(60000)
- await servers[2].followsCommand.follow({ targets: [ servers[0].url ] })
+ await servers[2].follows.follow({ hosts: [ servers[0].url ] })
await waitJobs(servers)
- await checkNewInstanceFollower(baseParams, 'localhost:' + servers[2].port, 'presence')
+ await checkNewInstanceFollower({ ...baseParams, followerHost: servers[2].host, checkType: 'presence' })
- const userOverride = { socketNotifications: userNotifications, token: userAccessToken, check: { web: true, mail: false } }
- await checkNewInstanceFollower({ ...baseParams, ...userOverride }, 'localhost:' + servers[2].port, 'absence')
+ const userOverride = { socketNotifications: userNotifications, token: userToken1, check: { web: true, mail: false } }
+ await checkNewInstanceFollower({ ...baseParams, ...userOverride, followerHost: servers[2].host, checkType: 'absence' })
})
it('Should send a notification on auto follow back', async function () {
this.timeout(40000)
- await servers[2].followsCommand.unfollow({ target: servers[0] })
+ await servers[2].follows.unfollow({ target: servers[0] })
await waitJobs(servers)
const config = {
}
}
}
- await servers[0].configCommand.updateCustomSubConfig({ newConfig: config })
+ await servers[0].config.updateCustomSubConfig({ newConfig: config })
- await servers[2].followsCommand.follow({ targets: [ servers[0].url ] })
+ await servers[2].follows.follow({ hosts: [ servers[0].url ] })
await waitJobs(servers)
const followerHost = servers[0].host
const followingHost = servers[2].host
- await checkAutoInstanceFollowing(baseParams, followerHost, followingHost, 'presence')
+ await checkAutoInstanceFollowing({ ...baseParams, followerHost, followingHost, checkType: 'presence' })
- const userOverride = { socketNotifications: userNotifications, token: userAccessToken, check: { web: true, mail: false } }
- await checkAutoInstanceFollowing({ ...baseParams, ...userOverride }, followerHost, followingHost, 'absence')
+ const userOverride = { socketNotifications: userNotifications, token: userToken1, check: { web: true, mail: false } }
+ await checkAutoInstanceFollowing({ ...baseParams, ...userOverride, followerHost, followingHost, checkType: 'absence' })
config.followings.instance.autoFollowBack.enabled = false
- await servers[0].configCommand.updateCustomSubConfig({ newConfig: config })
- await servers[0].followsCommand.unfollow({ target: servers[2] })
- await servers[2].followsCommand.unfollow({ target: servers[0] })
+ await servers[0].config.updateCustomSubConfig({ newConfig: config })
+ await servers[0].follows.unfollow({ target: servers[2] })
+ await servers[2].follows.unfollow({ target: servers[0] })
})
it('Should send a notification on auto instances index follow', async function () {
this.timeout(30000)
- await servers[0].followsCommand.unfollow({ target: servers[1] })
+ await servers[0].follows.unfollow({ target: servers[1] })
- await servers[0].configCommand.updateCustomSubConfig({ newConfig: config })
+ await servers[0].config.updateCustomSubConfig({ newConfig: config })
await wait(5000)
await waitJobs(servers)
const followerHost = servers[0].host
const followingHost = servers[1].host
- await checkAutoInstanceFollowing(baseParams, followerHost, followingHost, 'presence')
+ await checkAutoInstanceFollowing({ ...baseParams, followerHost, followingHost, checkType: 'presence' })
config.followings.instance.autoFollowIndex.enabled = false
- await servers[0].configCommand.updateCustomSubConfig({ newConfig: config })
- await servers[0].followsCommand.unfollow({ target: servers[1] })
+ await servers[0].config.updateCustomSubConfig({ newConfig: config })
+ await servers[0].follows.unfollow({ target: servers[1] })
})
})
let userBaseParams: CheckerBaseParams
let adminBaseParamsServer1: CheckerBaseParams
let adminBaseParamsServer2: CheckerBaseParams
- let videoUUID: string
+ let uuid: string
+ let shortUUID: string
let videoName: string
let currentCustomConfig: CustomConfig
server: servers[0],
emails,
socketNotifications: userNotifications,
- token: userAccessToken
+ token: userToken1
}
- currentCustomConfig = await servers[0].configCommand.getCustomConfig()
+ currentCustomConfig = await servers[0].config.getCustomConfig()
const autoBlacklistTestsCustomConfig = {
...currentCustomConfig,
// enable transcoding otherwise own publish notification after transcoding not expected
autoBlacklistTestsCustomConfig.transcoding.enabled = true
- await servers[0].configCommand.updateCustomConfig({ newCustomConfig: autoBlacklistTestsCustomConfig })
-
- await servers[0].subscriptionsCommand.add({ targetUri: 'user_1_channel@localhost:' + servers[0].port })
- await servers[1].subscriptionsCommand.add({ targetUri: 'user_1_channel@localhost:' + servers[0].port })
+ await servers[0].config.updateCustomConfig({ newCustomConfig: autoBlacklistTestsCustomConfig })
+ await servers[0].subscriptions.add({ targetUri: 'user_1_channel@' + servers[0].host })
+ await servers[1].subscriptions.add({ targetUri: 'user_1_channel@' + servers[0].host })
})
it('Should send notification to moderators on new video with auto-blacklist', async function () {
- this.timeout(40000)
+ this.timeout(120000)
videoName = 'video with auto-blacklist ' + buildUUID()
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name: videoName })
- videoUUID = resVideo.body.video.uuid
+ const video = await servers[0].videos.upload({ token: userToken1, attributes: { name: videoName } })
+ shortUUID = video.shortUUID
+ uuid = video.uuid
await waitJobs(servers)
- await checkVideoAutoBlacklistForModerators(adminBaseParamsServer1, videoUUID, videoName, 'presence')
+ await checkVideoAutoBlacklistForModerators({ ...adminBaseParamsServer1, shortUUID, videoName, checkType: 'presence' })
})
it('Should not send video publish notification if auto-blacklisted', async function () {
- await checkVideoIsPublished(userBaseParams, videoName, videoUUID, 'absence')
+ await checkVideoIsPublished({ ...userBaseParams, videoName, shortUUID, checkType: 'absence' })
})
it('Should not send a local user subscription notification if auto-blacklisted', async function () {
- await checkNewVideoFromSubscription(adminBaseParamsServer1, videoName, videoUUID, 'absence')
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName, shortUUID, checkType: 'absence' })
})
it('Should not send a remote user subscription notification if auto-blacklisted', async function () {
- await checkNewVideoFromSubscription(adminBaseParamsServer2, videoName, videoUUID, 'absence')
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer2, videoName, shortUUID, checkType: 'absence' })
})
it('Should send video published and unblacklist after video unblacklisted', async function () {
this.timeout(40000)
- await servers[0].blacklistCommand.remove({ videoId: videoUUID })
+ await servers[0].blacklist.remove({ videoId: uuid })
await waitJobs(servers)
})
it('Should send a local user subscription notification after removed from blacklist', async function () {
- await checkNewVideoFromSubscription(adminBaseParamsServer1, videoName, videoUUID, 'presence')
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName, shortUUID, checkType: 'presence' })
})
it('Should send a remote user subscription notification after removed from blacklist', async function () {
- await checkNewVideoFromSubscription(adminBaseParamsServer2, videoName, videoUUID, 'presence')
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer2, videoName, shortUUID, checkType: 'presence' })
})
it('Should send unblacklist but not published/subscription notes after unblacklisted if scheduled update pending', async function () {
- this.timeout(40000)
+ this.timeout(120000)
const updateAt = new Date(new Date().getTime() + 1000000)
const name = 'video with auto-blacklist and future schedule ' + buildUUID()
- const data = {
+ const attributes = {
name,
privacy: VideoPrivacy.PRIVATE,
scheduleUpdate: {
updateAt: updateAt.toISOString(),
- privacy: VideoPrivacy.PUBLIC
+ privacy: VideoPrivacy.PUBLIC as VideoPrivacy.PUBLIC
}
}
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, data)
- const uuid = resVideo.body.video.uuid
+ const { shortUUID, uuid } = await servers[0].videos.upload({ token: userToken1, attributes })
- await servers[0].blacklistCommand.remove({ videoId: uuid })
+ await servers[0].blacklist.remove({ videoId: uuid })
await waitJobs(servers)
- await checkNewBlacklistOnMyVideo(userBaseParams, uuid, name, 'unblacklist')
+ await checkNewBlacklistOnMyVideo({ ...userBaseParams, shortUUID, videoName: name, blacklistType: 'unblacklist' })
// FIXME: Can't test absence as two notifications sent to same user and util only checks last one
// One notification might be better anyways
// await checkVideoIsPublished(userBaseParams, name, uuid, 'absence')
- await checkNewVideoFromSubscription(adminBaseParamsServer1, name, uuid, 'absence')
- await checkNewVideoFromSubscription(adminBaseParamsServer2, name, uuid, 'absence')
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName: name, shortUUID, checkType: 'absence' })
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer2, videoName: name, shortUUID, checkType: 'absence' })
})
it('Should not send publish/subscription notifications after scheduled update if video still auto-blacklisted', async function () {
const name = 'video with schedule done and still auto-blacklisted ' + buildUUID()
- const data = {
+ const attributes = {
name,
privacy: VideoPrivacy.PRIVATE,
scheduleUpdate: {
updateAt: updateAt.toISOString(),
- privacy: VideoPrivacy.PUBLIC
+ privacy: VideoPrivacy.PUBLIC as VideoPrivacy.PUBLIC
}
}
- const resVideo = await uploadVideo(servers[0].url, userAccessToken, data)
- const uuid = resVideo.body.video.uuid
+ const { shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes })
await wait(6000)
- await checkVideoIsPublished(userBaseParams, name, uuid, 'absence')
- await checkNewVideoFromSubscription(adminBaseParamsServer1, name, uuid, 'absence')
- await checkNewVideoFromSubscription(adminBaseParamsServer2, name, uuid, 'absence')
+ await checkVideoIsPublished({ ...userBaseParams, videoName: name, shortUUID, checkType: 'absence' })
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName: name, shortUUID, checkType: 'absence' })
+ await checkNewVideoFromSubscription({ ...adminBaseParamsServer2, videoName: name, shortUUID, checkType: 'absence' })
})
it('Should not send a notification to moderators on new video without auto-blacklist', async function () {
- this.timeout(60000)
+ this.timeout(120000)
const name = 'video without auto-blacklist ' + buildUUID()
// admin with blacklist right will not be auto-blacklisted
- const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, { name })
- const uuid = resVideo.body.video.uuid
+ const { shortUUID } = await servers[0].videos.upload({ attributes: { name } })
await waitJobs(servers)
- await checkVideoAutoBlacklistForModerators(adminBaseParamsServer1, uuid, name, 'absence')
+ await checkVideoAutoBlacklistForModerators({ ...adminBaseParamsServer1, shortUUID, videoName: name, checkType: 'absence' })
})
after(async () => {
- await servers[0].configCommand.updateCustomConfig({ newCustomConfig: currentCustomConfig })
+ await servers[0].config.updateCustomConfig({ newCustomConfig: currentCustomConfig })
- await servers[0].subscriptionsCommand.remove({ uri: 'user_1_channel@localhost:' + servers[0].port })
- await servers[1].subscriptionsCommand.remove({ uri: 'user_1_channel@localhost:' + servers[0].port })
+ await servers[0].subscriptions.remove({ uri: 'user_1_channel@' + servers[0].host })
+ await servers[1].subscriptions.remove({ uri: 'user_1_channel@' + servers[0].host })
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff