Merge branch 'release/2.2.0' into develop

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

diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts
index 9040ac3084cb63be1db8d61a4efb164241524691..dee6575b92f6f078943333ca0873f36dc175ac34 100644 (file)
--- a/server/tests/api/videos/video-change-ownership.ts
+++ b/server/tests/api/videos/video-change-ownership.ts
@@ -1,23 +1,24 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import * as chai from 'chai'
 import 'mocha'
 import {
   acceptChangeOwnership,
   changeVideoOwnership,
-  createUser, doubleFollow, flushAndRunMultipleServers,
-  flushTests,
+  cleanupTests,
+  createUser,
+  doubleFollow,
+  flushAndRunMultipleServers,
+  flushAndRunServer,
   getMyUserInformation,
+  getVideo,
   getVideoChangeOwnershipList,
   getVideosList,
-  killallServers,
   refuseChangeOwnership,
-  runServer,
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
-  getVideo
+  userLogin
 } from '../../../../shared/extra-utils'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { User } from '../../../../shared/models/users'
@@ -37,7 +38,7 @@ describe('Test video change ownership - nominal', function () {
   }
   let firstUserAccessToken = ''
   let secondUserAccessToken = ''
-  let lastRequestChangeOwnershipId = undefined
+  let lastRequestChangeOwnershipId = ''
 
   before(async function () {
     this.timeout(50000)
@@ -47,15 +48,15 @@ describe('Test video change ownership - nominal', function () {
 
     const videoQuota = 42000000
     await createUser({
-      url: servers[ 0 ].url,
-      accessToken: servers[ 0 ].accessToken,
+      url: servers[0].url,
+      accessToken: servers[0].accessToken,
       username: firstUser.username,
       password: firstUser.password,
       videoQuota: videoQuota
     })
     await createUser({
-      url: servers[ 0 ].url,
-      accessToken: servers[ 0 ].accessToken,
+      url: servers[0].url,
+      accessToken: servers[0].accessToken,
       username: secondUser.username,
       password: secondUser.password,
       videoQuota: videoQuota
@@ -190,7 +191,7 @@ describe('Test video change ownership - nominal', function () {
     await waitJobs(servers)
   })
 
-  it('Should have video channel updated', async function () {
+  it('Should have the channel of the video updated', async function () {
     for (const server of servers) {
       const res = await getVideo(server.url, servers[0].video.uuid)
 
@@ -203,12 +204,12 @@ describe('Test video change ownership - nominal', function () {
   })
 
   after(async function () {
-    killallServers(servers)
+    await cleanupTests(servers)
   })
 })
 
 describe('Test video change ownership - quota too small', function () {
-  let server: ServerInfo = undefined
+  let server: ServerInfo
   const firstUser = {
     username: 'first',
     password: 'My great password'
@@ -219,15 +220,14 @@ describe('Test video change ownership - quota too small', function () {
   }
   let firstUserAccessToken = ''
   let secondUserAccessToken = ''
-  let lastRequestChangeOwnershipId = undefined
+  let lastRequestChangeOwnershipId = ''
 
   before(async function () {
     this.timeout(50000)
 
     // Run one server
-    await flushTests()
-    server = await runServer(1)
-    await setAccessTokensToServers([server])
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
 
     const videoQuota = 42000000
     const limitedVideoQuota = 10
@@ -298,6 +298,6 @@ describe('Test video change ownership - quota too small', function () {
   })
 
   after(async function () {
-    killallServers([server])
+    await cleanupTests([ server ])
   })
 })