aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/notifications/moderation-notifications.ts16
-rw-r--r--server/tests/api/transcoding/update-while-transcoding.ts3
2 files changed, 11 insertions, 8 deletions
diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts
index bb11a08aa..fa75182e1 100644
--- a/server/tests/api/notifications/moderation-notifications.ts
+++ b/server/tests/api/notifications/moderation-notifications.ts
@@ -188,7 +188,7 @@ describe('Test moderation notifications', function () {
188 }) 188 })
189 189
190 it('Should send a notification to reporter if the abuse has been accepted', async function () { 190 it('Should send a notification to reporter if the abuse has been accepted', async function () {
191 this.timeout(10000) 191 this.timeout(30000)
192 192
193 await servers[0].abuses.update({ abuseId, body: { state: AbuseState.ACCEPTED } }) 193 await servers[0].abuses.update({ abuseId, body: { state: AbuseState.ACCEPTED } })
194 await waitJobs(servers) 194 await waitJobs(servers)
@@ -197,7 +197,7 @@ describe('Test moderation notifications', function () {
197 }) 197 })
198 198
199 it('Should send a notification to reporter if the abuse has been rejected', async function () { 199 it('Should send a notification to reporter if the abuse has been rejected', async function () {
200 this.timeout(10000) 200 this.timeout(30000)
201 201
202 await servers[0].abuses.update({ abuseId, body: { state: AbuseState.REJECTED } }) 202 await servers[0].abuses.update({ abuseId, body: { state: AbuseState.REJECTED } })
203 await waitJobs(servers) 203 await waitJobs(servers)
@@ -242,7 +242,7 @@ describe('Test moderation notifications', function () {
242 }) 242 })
243 243
244 it('Should send a notification to reporter on new message', async function () { 244 it('Should send a notification to reporter on new message', async function () {
245 this.timeout(10000) 245 this.timeout(30000)
246 246
247 const message = 'my super message to users' 247 const message = 'my super message to users'
248 await servers[0].abuses.addMessage({ abuseId, message }) 248 await servers[0].abuses.addMessage({ abuseId, message })
@@ -252,7 +252,7 @@ describe('Test moderation notifications', function () {
252 }) 252 })
253 253
254 it('Should not send a notification to the admin if sent by the admin', async function () { 254 it('Should not send a notification to the admin if sent by the admin', async function () {
255 this.timeout(10000) 255 this.timeout(30000)
256 256
257 const message = 'my super message that should not be sent to the admin' 257 const message = 'my super message that should not be sent to the admin'
258 await servers[0].abuses.addMessage({ abuseId, message }) 258 await servers[0].abuses.addMessage({ abuseId, message })
@@ -263,7 +263,7 @@ describe('Test moderation notifications', function () {
263 }) 263 })
264 264
265 it('Should send a notification to moderators', async function () { 265 it('Should send a notification to moderators', async function () {
266 this.timeout(10000) 266 this.timeout(30000)
267 267
268 const message = 'my super message to moderators' 268 const message = 'my super message to moderators'
269 await servers[0].abuses.addMessage({ token: userToken1, abuseId: abuseId2, message }) 269 await servers[0].abuses.addMessage({ token: userToken1, abuseId: abuseId2, message })
@@ -274,7 +274,7 @@ describe('Test moderation notifications', function () {
274 }) 274 })
275 275
276 it('Should not send a notification to reporter if sent by the reporter', async function () { 276 it('Should not send a notification to reporter if sent by the reporter', async function () {
277 this.timeout(10000) 277 this.timeout(30000)
278 278
279 const message = 'my super message that should not be sent to reporter' 279 const message = 'my super message that should not be sent to reporter'
280 await servers[0].abuses.addMessage({ token: userToken1, abuseId: abuseId2, message }) 280 await servers[0].abuses.addMessage({ token: userToken1, abuseId: abuseId2, message })
@@ -298,7 +298,7 @@ describe('Test moderation notifications', function () {
298 }) 298 })
299 299
300 it('Should send a notification to video owner on blacklist', async function () { 300 it('Should send a notification to video owner on blacklist', async function () {
301 this.timeout(10000) 301 this.timeout(30000)
302 302
303 const name = 'video for abuse ' + buildUUID() 303 const name = 'video for abuse ' + buildUUID()
304 const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes: { name } }) 304 const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
@@ -310,7 +310,7 @@ describe('Test moderation notifications', function () {
310 }) 310 })
311 311
312 it('Should send a notification to video owner on unblacklist', async function () { 312 it('Should send a notification to video owner on unblacklist', async function () {
313 this.timeout(10000) 313 this.timeout(30000)
314 314
315 const name = 'video for abuse ' + buildUUID() 315 const name = 'video for abuse ' + buildUUID()
316 const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes: { name } }) 316 const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken1, attributes: { name } })
diff --git a/server/tests/api/transcoding/update-while-transcoding.ts b/server/tests/api/transcoding/update-while-transcoding.ts
index 8e32ea069..f4d728118 100644
--- a/server/tests/api/transcoding/update-while-transcoding.ts
+++ b/server/tests/api/transcoding/update-while-transcoding.ts
@@ -38,6 +38,7 @@ describe('Test update video privacy while transcoding', function () {
38 }) 38 })
39 39
40 it('Should not have an error while quickly updating a private video to public after upload #2', async function () { 40 it('Should not have an error while quickly updating a private video to public after upload #2', async function () {
41 this.timeout(60000)
41 42
42 { 43 {
43 const attributes = { 44 const attributes = {
@@ -56,6 +57,8 @@ describe('Test update video privacy while transcoding', function () {
56 }) 57 })
57 58
58 it('Should not have an error while quickly updating a private video to public after upload #3', async function () { 59 it('Should not have an error while quickly updating a private video to public after upload #3', async function () {
60 this.timeout(60000)
61
59 const attributes = { 62 const attributes = {
60 name: 'quick update 3', 63 name: 'quick update 3',
61 privacy: VideoPrivacy.PRIVATE 64 privacy: VideoPrivacy.PRIVATE