Implement user blocking on server side

[github/Chocobozzz/PeerTube.git] / server / tests / api / videos / video-abuse.ts

diff --git a/server/tests/api/videos/video-abuse.ts b/server/tests/api/videos/video-abuse.ts
index 3fcf5d8c7990b9cb2309d27f5822aa3426aa06cf..dde309b96a5a5746d80748836d4305ac22336000 100644 (file)
--- a/server/tests/api/videos/video-abuse.ts
+++ b/server/tests/api/videos/video-abuse.ts
@@ -2,19 +2,19 @@
 
 import * as chai from 'chai'
 import 'mocha'
+import { VideoAbuse } from '../../../../shared/models/videos'
 import {
   flushAndRunMultipleServers,
-  flushTests,
   getVideoAbusesList,
   getVideosList,
   killallServers,
   reportVideoAbuse,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo,
-  wait
+  uploadVideo
 } from '../../utils/index'
 import { doubleFollow } from '../../utils/server/follows'
+import { waitJobs } from '../../utils/server/jobs'
 
 const expect = chai.expect
 
@@ -47,7 +47,7 @@ describe('Test video abuses', function () {
     await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes)
 
     // Wait videos propagation, server 2 has transcoding enabled
-    await wait(15000)
+    await waitJobs(servers)
 
     const res = await getVideosList(servers[0].url)
     const videos = res.body.data
@@ -67,13 +67,13 @@ describe('Test video abuses', function () {
   })
 
   it('Should report abuse on a local video', async function () {
-    this.timeout(10000)
+    this.timeout(15000)
 
     const reason = 'my super bad reason'
     await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[0].video.id, reason)
 
     // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2
-    await wait(5000)
+    await waitJobs(servers)
   })
 
   it('Should have 1 video abuses on server 1 and 0 on server 2', async function () {
@@ -83,11 +83,11 @@ describe('Test video abuses', function () {
     expect(res1.body.data).to.be.an('array')
     expect(res1.body.data.length).to.equal(1)
 
-    const abuse = res1.body.data[0]
+    const abuse: VideoAbuse = res1.body.data[0]
     expect(abuse.reason).to.equal('my super bad reason')
-    expect(abuse.reporterUsername).to.equal('root')
-    expect(abuse.reporterServerHost).to.equal('localhost:9001')
-    expect(abuse.videoId).to.equal(servers[0].video.id)
+    expect(abuse.reporterAccount.name).to.equal('root')
+    expect(abuse.reporterAccount.host).to.equal('localhost:9001')
+    expect(abuse.video.id).to.equal(servers[0].video.id)
 
     const res2 = await getVideoAbusesList(servers[1].url, servers[1].accessToken)
     expect(res2.body.total).to.equal(0)
@@ -102,7 +102,7 @@ describe('Test video abuses', function () {
     await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[1].video.id, reason)
 
     // We wait requests propagation
-    await wait(5000)
+    await waitJobs(servers)
   })
 
   it('Should have 2 video abuse on server 1 and 1 on server 2', async function () {
@@ -111,35 +111,30 @@ describe('Test video abuses', function () {
     expect(res1.body.data).to.be.an('array')
     expect(res1.body.data.length).to.equal(2)
 
-    const abuse1 = res1.body.data[0]
+    const abuse1: VideoAbuse = res1.body.data[0]
     expect(abuse1.reason).to.equal('my super bad reason')
-    expect(abuse1.reporterUsername).to.equal('root')
-    expect(abuse1.reporterServerHost).to.equal('localhost:9001')
-    expect(abuse1.videoId).to.equal(servers[0].video.id)
+    expect(abuse1.reporterAccount.name).to.equal('root')
+    expect(abuse1.reporterAccount.host).to.equal('localhost:9001')
+    expect(abuse1.video.id).to.equal(servers[0].video.id)
 
-    const abuse2 = res1.body.data[1]
+    const abuse2: VideoAbuse = res1.body.data[1]
     expect(abuse2.reason).to.equal('my super bad reason 2')
-    expect(abuse2.reporterUsername).to.equal('root')
-    expect(abuse2.reporterServerHost).to.equal('localhost:9001')
-    expect(abuse2.videoId).to.equal(servers[1].video.id)
+    expect(abuse2.reporterAccount.name).to.equal('root')
+    expect(abuse2.reporterAccount.host).to.equal('localhost:9001')
+    expect(abuse2.video.id).to.equal(servers[1].video.id)
 
     const res2 = await getVideoAbusesList(servers[1].url, servers[1].accessToken)
     expect(res2.body.total).to.equal(1)
     expect(res2.body.data).to.be.an('array')
     expect(res2.body.data.length).to.equal(1)
 
-    const abuse3 = res2.body.data[0]
+    const abuse3: VideoAbuse = res2.body.data[0]
     expect(abuse3.reason).to.equal('my super bad reason 2')
-    expect(abuse3.reporterUsername).to.equal('root')
-    expect(abuse3.reporterServerHost).to.equal('localhost:9001')
+    expect(abuse3.reporterAccount.name).to.equal('root')
+    expect(abuse3.reporterAccount.host).to.equal('localhost:9001')
   })
 
   after(async function () {
     killallServers(servers)
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
   })
 })