X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fnotifications%2Fcomments-notifications.ts;h=5a50af0402d1ce72406f6a2f2565f18ed9f838b2;hb=9b6c9b5ae64cce9d9b3cd1bed8546f4f1725cb79;hp=919be4bcaaee835c1025ed189c4c4a61fc219da9;hpb=bf54587a3e2ad9c2c186828f2a5682b91ee2cc00;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/notifications/comments-notifications.ts b/server/tests/api/notifications/comments-notifications.ts
index 919be4bca..5a50af040 100644
--- a/server/tests/api/notifications/comments-notifications.ts
+++ b/server/tests/api/notifications/comments-notifications.ts
@@ -1,20 +1,15 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
 import {
   checkCommentMention,
   CheckerBaseParams,
   checkNewCommentOnMyVideo,
-  cleanupTests,
   MockSmtpServer,
-  PeerTubeServer,
-  prepareNotificationsTest,
-  waitJobs
-} from '@shared/server-commands'
+  prepareNotificationsTest
+} from '@server/tests/shared'
 import { UserNotification } from '@shared/models'
-
-const expect = chai.expect
+import { cleanupTests, PeerTubeServer, waitJobs } from '@shared/server-commands'
 
 describe('Test comments notifications', function () {
   let servers: PeerTubeServer[] = []
@@ -50,7 +45,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new comment notification after a comment on another video', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } })
 
@@ -62,7 +57,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new comment notification if I comment my own video', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } })
 
@@ -74,7 +69,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new comment notification if the account is muted', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       await servers[0].blocklist.addToMyBlocklist({ token: userToken, account: 'root' })
 
@@ -90,7 +85,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should send a new comment notification after a local comment on my video', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } })
 
@@ -102,7 +97,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should send a new comment notification after a remote comment on my video', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } })
 
@@ -120,7 +115,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should send a new comment notification after a local reply on my video', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } })
 
@@ -133,7 +128,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should send a new comment notification after a remote reply on my video', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } })
       await waitJobs(servers)
@@ -159,7 +154,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should convert markdown in comment to html', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'cool video' } })
 
@@ -189,7 +184,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new mention comment notification if I mention the video owner', async function () {
-      this.timeout(10000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } })
 
@@ -200,7 +195,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new mention comment notification if I mention myself', async function () {
-      this.timeout(10000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } })
 
@@ -211,7 +206,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new mention notification if the account is muted', async function () {
-      this.timeout(10000)
+      this.timeout(30000)
 
       await servers[0].blocklist.addToMyBlocklist({ token: userToken, account: 'root' })
 
@@ -226,7 +221,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should not send a new mention notification if the remote account mention a local account', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } })
 
@@ -240,7 +235,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should send a new mention notification after local comments', async function () {
-      this.timeout(10000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } })
 
@@ -256,13 +251,13 @@ describe('Test comments notifications', function () {
     })
 
     it('Should send a new mention notification after remote comments', async function () {
-      this.timeout(20000)
+      this.timeout(30000)
 
       const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } })
 
       await waitJobs(servers)
 
-      const text1 = `hello @user_1@localhost:${servers[0].port} 1`
+      const text1 = `hello @user_1@${servers[0].host} 1`
       const { id: server2ThreadId } = await servers[1].comments.createThread({ videoId: uuid, text: text1 })
 
       await waitJobs(servers)
@@ -274,7 +269,7 @@ describe('Test comments notifications', function () {
       const threadId = data[0].id
       await checkCommentMention({ ...baseParams, shortUUID, commentId: threadId, threadId, byAccountDisplayName, checkType: 'presence' })
 
-      const text2 = `@user_1@localhost:${servers[0].port} hello 2 @root@localhost:${servers[0].port}`
+      const text2 = `@user_1@${servers[0].host} hello 2 @root@${servers[0].host}`
       await servers[1].comments.addReply({ videoId: uuid, toCommentId: server2ThreadId, text: text2 })
 
       await waitJobs(servers)
@@ -288,7 +283,7 @@ describe('Test comments notifications', function () {
     })
 
     it('Should convert markdown in comment to html', async function () {
-      this.timeout(10000)
+      this.timeout(30000)
 
       const { uuid } = await servers[0].videos.upload({ attributes: { name: 'super video' } })