X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideo-abuse.ts;h=bc21ee59b7e779f24bc95fa719f689ea321eb8aa;hb=afffe98839db7ccbfa9fb8b7d1413b97900fdc73;hp=f2a2c322a2e381a50bc69430d8cab3cf7587e56b;hpb=1b3989b0961d22a5a45ad16239e3c3f58f66180c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/video-abuse.ts b/server/tests/api/video-abuse.ts
index f2a2c322a..bc21ee59b 100644
--- a/server/tests/api/video-abuse.ts
+++ b/server/tests/api/video-abuse.ts
@@ -1,22 +1,22 @@
 /* tslint:disable:no-unused-expression */
 
-import 'mocha'
 import * as chai from 'chai'
-const expect = chai.expect
-
+import 'mocha'
 import {
-  ServerInfo,
   flushAndRunMultipleServers,
-  uploadVideo,
-  makeFriends,
-  getVideosList,
-  wait,
-  setAccessTokensToServers,
+  flushTests,
   getVideoAbusesList,
-  reportVideoAbuse,
+  getVideosList,
   killallServers,
-  flushTests
+  reportVideoAbuse,
+  ServerInfo,
+  setAccessTokensToServers,
+  uploadVideo,
+  wait
 } from '../utils'
+import { doubleFollow } from '../utils/follows'
+
+const expect = chai.expect
 
 describe('Test video abuses', function () {
   let servers: ServerInfo[] = []
@@ -30,32 +30,32 @@ describe('Test video abuses', function () {
     // Get the access tokens
     await setAccessTokensToServers(servers)
 
-    // Pod 1 makes friend with pod 2
-    await makeFriends(servers[0].url, servers[0].accessToken)
+    // Server 1 and server 2 follow each other
+    await doubleFollow(servers[0], servers[1])
 
-    // Upload some videos on each pods
+    // Upload some videos on each servers
     const video1Attributes = {
-      name: 'my super name for pod 1',
-      description: 'my super description for pod 1'
+      name: 'my super name for server 1',
+      description: 'my super description for server 1'
     }
     await uploadVideo(servers[0].url, servers[0].accessToken, video1Attributes)
 
     const video2Attributes = {
-      name: 'my super name for pod 2',
-      description: 'my super description for pod 2'
+      name: 'my super name for server 2',
+      description: 'my super description for server 2'
     }
     await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes)
 
     // Wait videos propagation
-    await wait(22000)
+    await wait(25000)
 
     const res = await getVideosList(servers[0].url)
     const videos = res.body.data
 
     expect(videos.length).to.equal(2)
 
-    servers[0].video = videos.find(video => video.name === 'my super name for pod 1')
-    servers[1].video = videos.find(video => video.name === 'my super name for pod 2')
+    servers[0].video = videos.find(video => video.name === 'my super name for server 1')
+    servers[1].video = videos.find(video => video.name === 'my super name for server 2')
   })
 
   it('Should not have video abuses', async function () {
@@ -72,11 +72,11 @@ describe('Test video abuses', function () {
     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 pod 1 is not supposed to make a request to pod 2
+    // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2
     await wait(11000)
   })
 
-  it('Should have 1 video abuses on pod 1 and 0 on pod 2', async function () {
+  it('Should have 1 video abuses on server 1 and 0 on server 2', async function () {
     const res1 = await getVideoAbusesList(servers[0].url, servers[0].accessToken)
 
     expect(res1.body.total).to.equal(1)
@@ -86,7 +86,7 @@ describe('Test video abuses', function () {
     const abuse = res1.body.data[0]
     expect(abuse.reason).to.equal('my super bad reason')
     expect(abuse.reporterUsername).to.equal('root')
-    expect(abuse.reporterPodHost).to.equal('localhost:9001')
+    expect(abuse.reporterServerHost).to.equal('localhost:9001')
     expect(abuse.videoId).to.equal(servers[0].video.id)
 
     const res2 = await getVideoAbusesList(servers[1].url, servers[1].accessToken)
@@ -96,16 +96,16 @@ describe('Test video abuses', function () {
   })
 
   it('Should report abuse on a remote video', async function () {
-    this.timeout(15000)
+    this.timeout(25000)
 
     const reason = 'my super bad reason 2'
     await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[1].video.id, reason)
 
     // We wait requests propagation
-    await wait(11000)
+    await wait(15000)
   })
 
-  it('Should have 2 video abuse on pod 1 and 1 on pod 2', async function () {
+  it('Should have 2 video abuse on server 1 and 1 on server 2', async function () {
     const res1 = await getVideoAbusesList(servers[0].url, servers[0].accessToken)
     expect(res1.body.total).to.equal(2)
     expect(res1.body.data).to.be.an('array')
@@ -114,13 +114,13 @@ describe('Test video abuses', function () {
     const abuse1 = res1.body.data[0]
     expect(abuse1.reason).to.equal('my super bad reason')
     expect(abuse1.reporterUsername).to.equal('root')
-    expect(abuse1.reporterPodHost).to.equal('localhost:9001')
+    expect(abuse1.reporterServerHost).to.equal('localhost:9001')
     expect(abuse1.videoId).to.equal(servers[0].video.id)
 
     const abuse2 = res1.body.data[1]
     expect(abuse2.reason).to.equal('my super bad reason 2')
     expect(abuse2.reporterUsername).to.equal('root')
-    expect(abuse2.reporterPodHost).to.equal('localhost:9001')
+    expect(abuse2.reporterServerHost).to.equal('localhost:9001')
     expect(abuse2.videoId).to.equal(servers[1].video.id)
 
     const res2 = await getVideoAbusesList(servers[1].url, servers[1].accessToken)
@@ -131,7 +131,7 @@ describe('Test video abuses', function () {
     const abuse3 = res2.body.data[0]
     expect(abuse3.reason).to.equal('my super bad reason 2')
     expect(abuse3.reporterUsername).to.equal('root')
-    expect(abuse3.reporterPodHost).to.equal('localhost:9001')
+    expect(abuse3.reporterServerHost).to.equal('localhost:9001')
   })
 
   after(async function () {