Add migrations

1 files changed, 20 insertions, 20 deletions

diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 88b68d977..ea74bde6a 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { MyUser, User, UserRole, Video, AbuseState, AbuseUpdate, VideoPlaylistType } from '@shared/models'
+import * as chai from 'chai'
+import { AbuseState, AbuseUpdate, MyUser, User, UserRole, Video, VideoPlaylistType } from '@shared/models'
+import { CustomConfig } from '@shared/models/server'
 import {
   addVideoCommentThread,
   blockUser,
@@ -10,6 +11,7 @@ import {
   createUser,
   deleteMe,
   flushAndRunServer,
+  getAbusesList,
   getAccountRatings,
   getBlacklistedVideosList,
   getCustomConfig,
@@ -19,7 +21,6 @@ import {
   getUserInformation,
   getUsersList,
   getUsersListPaginationAndSort,
-  getVideoAbusesList,
   getVideoChannel,
   getVideosList,
   installPlugin,
@@ -29,15 +30,15 @@ import {
   registerUserWithChannel,
   removeUser,
   removeVideo,
-  reportVideoAbuse,
+  reportAbuse,
   ServerInfo,
   testImage,
   unblockUser,
+  updateAbuse,
   updateCustomSubConfig,
   updateMyAvatar,
   updateMyUser,
   updateUser,
-  updateVideoAbuse,
   uploadVideo,
   userLogin,
   waitJobs
@@ -46,7 +47,6 @@ import { follow } from '../../../../shared/extra-utils/server/follows'
 import { logout, serverLogin, setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
 import { getMyVideos } from '../../../../shared/extra-utils/videos/videos'
 import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
-import { CustomConfig } from '@shared/models/server'
 
 const expect = chai.expect
 
@@ -302,10 +302,10 @@ describe('Test users', function () {
       expect(userGet.videosCount).to.equal(0)
       expect(userGet.videoCommentsCount).to.be.a('number')
       expect(userGet.videoCommentsCount).to.equal(0)
-      expect(userGet.videoAbusesCount).to.be.a('number')
-      expect(userGet.videoAbusesCount).to.equal(0)
-      expect(userGet.videoAbusesAcceptedCount).to.be.a('number')
-      expect(userGet.videoAbusesAcceptedCount).to.equal(0)
+      expect(userGet.abusesCount).to.be.a('number')
+      expect(userGet.abusesCount).to.equal(0)
+      expect(userGet.abusesAcceptedCount).to.be.a('number')
+      expect(userGet.abusesAcceptedCount).to.equal(0)
     })
   })
 
@@ -895,9 +895,9 @@ describe('Test users', function () {
 
       expect(user.videosCount).to.equal(0)
       expect(user.videoCommentsCount).to.equal(0)
-      expect(user.videoAbusesCount).to.equal(0)
-      expect(user.videoAbusesCreatedCount).to.equal(0)
-      expect(user.videoAbusesAcceptedCount).to.equal(0)
+      expect(user.abusesCount).to.equal(0)
+      expect(user.abusesCreatedCount).to.equal(0)
+      expect(user.abusesAcceptedCount).to.equal(0)
     })
 
     it('Should report correct videos count', async function () {
@@ -924,26 +924,26 @@ describe('Test users', function () {
       expect(user.videoCommentsCount).to.equal(1)
     })
 
-    it('Should report correct video abuses counts', async function () {
+    it('Should report correct abuses counts', async function () {
       const reason = 'my super bad reason'
-      await reportVideoAbuse(server.url, user17AccessToken, videoId, reason)
+      await reportAbuse({ url: server.url, token: user17AccessToken, videoId, reason })
 
-      const res1 = await getVideoAbusesList({ url: server.url, token: server.accessToken })
+      const res1 = await getAbusesList({ url: server.url, token: server.accessToken })
       const abuseId = res1.body.data[0].id
 
       const res2 = await getUserInformation(server.url, server.accessToken, user17Id, true)
       const user2: User = res2.body
 
-      expect(user2.videoAbusesCount).to.equal(1) // number of incriminations
-      expect(user2.videoAbusesCreatedCount).to.equal(1) // number of reports created
+      expect(user2.abusesCount).to.equal(1) // number of incriminations
+      expect(user2.abusesCreatedCount).to.equal(1) // number of reports created
 
       const body: AbuseUpdate = { state: AbuseState.ACCEPTED }
-      await updateVideoAbuse(server.url, server.accessToken, videoId, abuseId, body)
+      await updateAbuse(server.url, server.accessToken, abuseId, body)
 
       const res3 = await getUserInformation(server.url, server.accessToken, user17Id, true)
       const user3: User = res3.body
 
-      expect(user3.videoAbusesAcceptedCount).to.equal(1) // number of reports created accepted
+      expect(user3.abusesAcceptedCount).to.equal(1) // number of reports created accepted
     })
   })