Merge branch 'release/3.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / bulk.ts

diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts
index 5c8673e00e3bb3cf7933ad3f07b6206b0a9abeb0..16cbcd5c38f5887134f8816f1b14585c361cc1f9 100644 (file)
--- a/server/tests/api/server/bulk.ts
+++ b/server/tests/api/server/bulk.ts
@@ -2,27 +2,22 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { Video } from '@shared/models'
 import {
   BulkCommand,
   cleanupTests,
-  createUser,
+  createMultipleServers,
   doubleFollow,
-  flushAndRunMultipleServers,
-  getVideosList,
-  ServerInfo,
+  PeerTubeServer,
   setAccessTokensToServers,
-  uploadVideo,
-  userLogin,
   waitJobs
-} from '../../../../shared/extra-utils/index'
+} from '@shared/extra-utils'
 
 const expect = chai.expect
 
 describe('Test bulk actions', function () {
   const commentsUser3: { videoId: number, commentId: number }[] = []
 
-  let servers: ServerInfo[] = []
+  let servers: PeerTubeServer[] = []
   let user1Token: string
   let user2Token: string
   let user3Token: string
@@ -32,30 +27,30 @@ describe('Test bulk actions', function () {
   before(async function () {
     this.timeout(30000)
 
-    servers = await flushAndRunMultipleServers(2)
+    servers = await createMultipleServers(2)
 
     // Get the access tokens
     await setAccessTokensToServers(servers)
 
     {
       const user = { username: 'user1', password: 'password' }
-      await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
+      await servers[0].users.create({ username: user.username, password: user.password })
 
-      user1Token = await userLogin(servers[0], user)
+      user1Token = await servers[0].login.getAccessToken(user)
     }
 
     {
       const user = { username: 'user2', password: 'password' }
-      await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
+      await servers[0].users.create({ username: user.username, password: user.password })
 
-      user2Token = await userLogin(servers[0], user)
+      user2Token = await servers[0].login.getAccessToken(user)
     }
 
     {
       const user = { username: 'user3', password: 'password' }
-      await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
+      await servers[1].users.create({ username: user.username, password: user.password })
 
-      user3Token = await userLogin(servers[1], user)
+      user3Token = await servers[1].login.getAccessToken(user)
     }
 
     await doubleFollow(servers[0], servers[1])
@@ -66,12 +61,11 @@ describe('Test bulk actions', function () {
   describe('Bulk remove comments', function () {
     async function checkInstanceCommentsRemoved () {
       {
-        const res = await getVideosList(servers[0].url)
-        const videos = res.body.data as Video[]
+        const { data } = await servers[0].videos.list()
 
         // Server 1 should not have these comments anymore
-        for (const video of videos) {
-          const { data } = await servers[0].commentsCommand.listThreads({ videoId: video.id })
+        for (const video of data) {
+          const { data } = await servers[0].comments.listThreads({ videoId: video.id })
           const comment = data.find(c => c.text === 'comment by user 3')
 
           expect(comment).to.not.exist
@@ -79,12 +73,11 @@ describe('Test bulk actions', function () {
       }
 
       {
-        const res = await getVideosList(servers[1].url)
-        const videos = res.body.data as Video[]
+        const { data } = await servers[1].videos.list()
 
         // Server 1 should not have these comments on videos of server 1
-        for (const video of videos) {
-          const { data } = await servers[1].commentsCommand.listThreads({ videoId: video.id })
+        for (const video of data) {
+          const { data } = await servers[1].comments.listThreads({ videoId: video.id })
           const comment = data.find(c => c.text === 'comment by user 3')
 
           if (video.account.host === 'localhost:' + servers[0].port) {
@@ -99,30 +92,30 @@ describe('Test bulk actions', function () {
     before(async function () {
       this.timeout(120000)
 
-      await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video 1 server 1' })
-      await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video 2 server 1' })
-      await uploadVideo(servers[0].url, user1Token, { name: 'video 3 server 1' })
+      await servers[0].videos.upload({ attributes: { name: 'video 1 server 1' } })
+      await servers[0].videos.upload({ attributes: { name: 'video 2 server 1' } })
+      await servers[0].videos.upload({ token: user1Token, attributes: { name: 'video 3 server 1' } })
 
-      await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 1 server 2' })
+      await servers[1].videos.upload({ attributes: { name: 'video 1 server 2' } })
 
       await waitJobs(servers)
 
       {
-        const res = await getVideosList(servers[0].url)
-        for (const video of res.body.data) {
-          await servers[0].commentsCommand.createThread({ videoId: video.id, text: 'comment by root server 1' })
-          await servers[0].commentsCommand.createThread({ token: user1Token, videoId: video.id, text: 'comment by user 1' })
-          await servers[0].commentsCommand.createThread({ token: user2Token, videoId: video.id, text: 'comment by user 2' })
+        const { data } = await servers[0].videos.list()
+        for (const video of data) {
+          await servers[0].comments.createThread({ videoId: video.id, text: 'comment by root server 1' })
+          await servers[0].comments.createThread({ token: user1Token, videoId: video.id, text: 'comment by user 1' })
+          await servers[0].comments.createThread({ token: user2Token, videoId: video.id, text: 'comment by user 2' })
         }
       }
 
       {
-        const res = await getVideosList(servers[1].url)
+        const { data } = await servers[1].videos.list()
 
-        for (const video of res.body.data) {
-          await servers[1].commentsCommand.createThread({ videoId: video.id, text: 'comment by root server 2' })
+        for (const video of data) {
+          await servers[1].comments.createThread({ videoId: video.id, text: 'comment by root server 2' })
 
-          const comment = await servers[1].commentsCommand.createThread({ token: user3Token, videoId: video.id, text: 'comment by user 3' })
+          const comment = await servers[1].comments.createThread({ token: user3Token, videoId: video.id, text: 'comment by user 3' })
           commentsUser3.push({ videoId: video.id, commentId: comment.id })
         }
       }
@@ -144,10 +137,10 @@ describe('Test bulk actions', function () {
       await waitJobs(servers)
 
       for (const server of servers) {
-        const res = await getVideosList(server.url)
+        const { data } = await server.videos.list()
 
-        for (const video of res.body.data) {
-          const { data } = await server.commentsCommand.listThreads({ videoId: video.id })
+        for (const video of data) {
+          const { data } = await server.comments.listThreads({ videoId: video.id })
           const comment = data.find(c => c.text === 'comment by user 2')
 
           if (video.name === 'video 3 server 1') expect(comment).to.not.exist
@@ -175,7 +168,7 @@ describe('Test bulk actions', function () {
       this.timeout(60000)
 
       for (const obj of commentsUser3) {
-        await servers[1].commentsCommand.addReply({
+        await servers[1].comments.addReply({
           token: user3Token,
           videoId: obj.videoId,
           toCommentId: obj.commentId,