Cleanup shared models

[github/Chocobozzz/PeerTube.git] / server / tests / api / notifications / moderation-notifications.ts

diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts
index 81f02ff993d9d71bc0a9f8eec4313d0eba7cb773..4ce6675b6f05dea2a7fec041b6ddfb464b10ae81 100644 (file)
--- a/server/tests/api/notifications/moderation-notifications.ts
+++ b/server/tests/api/notifications/moderation-notifications.ts
@@ -2,8 +2,9 @@
 
 import 'mocha'
 import { v4 as uuidv4 } from 'uuid'
-
+import { AbuseState } from '@shared/models'
 import {
+  addAbuseMessage,
   addVideoCommentThread,
   addVideoToBlacklist,
   cleanupTests,
@@ -20,18 +21,19 @@ import {
   removeVideoFromBlacklist,
   reportAbuse,
   unfollow,
+  updateAbuse,
   updateCustomConfig,
   updateCustomSubConfig,
-  wait,
-  updateAbuse,
-  addAbuseMessage
+  wait
 } from '../../../../shared/extra-utils'
 import { ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index'
 import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import {
+  checkAbuseStateChange,
   checkAutoInstanceFollowing,
   CheckerBaseParams,
+  checkNewAbuseMessage,
   checkNewAccountAbuseForModerators,
   checkNewBlacklistOnMyVideo,
   checkNewCommentAbuseForModerators,
@@ -41,15 +43,12 @@ import {
   checkUserRegistered,
   checkVideoAutoBlacklistForModerators,
   checkVideoIsPublished,
-  prepareNotificationsTest,
-  checkAbuseStateChange,
-  checkNewAbuseMessage
+  prepareNotificationsTest
 } from '../../../../shared/extra-utils/users/user-notifications'
 import { addUserSubscription, removeUserSubscription } from '../../../../shared/extra-utils/users/user-subscriptions'
 import { CustomConfig } from '../../../../shared/models/server'
 import { UserNotification } from '../../../../shared/models/users'
 import { VideoPrivacy } from '../../../../shared/models/videos'
-import { AbuseState } from '@shared/models'
 
 describe('Test moderation notifications', function () {
   let servers: ServerInfo[] = []
@@ -121,6 +120,8 @@ describe('Test moderation notifications', function () {
       const resComment = await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4())
       const comment = resComment.body.comment
 
+      await waitJobs(servers)
+
       await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason: 'super reason' })
 
       await waitJobs(servers)
@@ -362,16 +363,7 @@ describe('Test moderation notifications', function () {
 
   describe('New instance follows', function () {
     const instanceIndexServer = new MockInstancesIndex()
-    const config = {
-      followings: {
-        instance: {
-          autoFollowIndex: {
-            indexUrl: 'http://localhost:42101/api/v1/instances/hosts',
-            enabled: true
-          }
-        }
-      }
-    }
+    let config: any
     let baseParams: CheckerBaseParams
 
     before(async () => {
@@ -382,8 +374,19 @@ describe('Test moderation notifications', function () {
         token: servers[0].accessToken
       }
 
-      await instanceIndexServer.initialize()
+      const port = await instanceIndexServer.initialize()
       instanceIndexServer.addInstance(servers[1].host)
+
+      config = {
+        followings: {
+          instance: {
+            autoFollowIndex: {
+              indexUrl: `http://localhost:${port}/api/v1/instances/hosts`,
+              enabled: true
+            }
+          }
+        }
+      }
     })
 
     it('Should send a notification only to admin when there is a new instance follower', async function () {
@@ -604,7 +607,7 @@ describe('Test moderation notifications', function () {
     })
 
     it('Should not send a notification to moderators on new video without auto-blacklist', async function () {
-      this.timeout(40000)
+      this.timeout(60000)
 
       const name = 'video without auto-blacklist ' + uuidv4()