X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fbulk.ts;h=1b81a695452312930262c777a21656ed7a08ff62;hb=e5a781ec25191c0dbb4a991f25307732d798619d;hp=c83bcfb226f3dab6360ac8a8eb27eafa3d09caa1;hpb=d23dd9fbfc4d26026352c10f81d2795ceaf2908a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts
index c83bcfb22..1b81a6954 100644
--- a/server/tests/api/server/bulk.ts
+++ b/server/tests/api/server/bulk.ts
@@ -5,19 +5,19 @@ import * as chai from 'chai'
 import {
   BulkCommand,
   cleanupTests,
+  createMultipleServers,
   doubleFollow,
-  flushAndRunMultipleServers,
-  ServerInfo,
+  PeerTubeServer,
   setAccessTokensToServers,
   waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
 
 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
@@ -27,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 servers[0].usersCommand.create({ username: user.username, password: user.password })
+      await servers[0].users.create({ username: user.username, password: user.password })
 
-      user1Token = await servers[0].loginCommand.getAccessToken(user)
+      user1Token = await servers[0].login.getAccessToken(user)
     }
 
     {
       const user = { username: 'user2', password: 'password' }
-      await servers[0].usersCommand.create({ username: user.username, password: user.password })
+      await servers[0].users.create({ username: user.username, password: user.password })
 
-      user2Token = await servers[0].loginCommand.getAccessToken(user)
+      user2Token = await servers[0].login.getAccessToken(user)
     }
 
     {
       const user = { username: 'user3', password: 'password' }
-      await servers[1].usersCommand.create({ username: user.username, password: user.password })
+      await servers[1].users.create({ username: user.username, password: user.password })
 
-      user3Token = await servers[1].loginCommand.getAccessToken(user)
+      user3Token = await servers[1].login.getAccessToken(user)
     }
 
     await doubleFollow(servers[0], servers[1])
@@ -61,11 +61,11 @@ describe('Test bulk actions', function () {
   describe('Bulk remove comments', function () {
     async function checkInstanceCommentsRemoved () {
       {
-        const { data } = await servers[0].videosCommand.list()
+        const { data } = await servers[0].videos.list()
 
         // Server 1 should not have these comments anymore
         for (const video of data) {
-          const { data } = await servers[0].commentsCommand.listThreads({ videoId: video.id })
+          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
@@ -73,11 +73,11 @@ describe('Test bulk actions', function () {
       }
 
       {
-        const { data } = await servers[1].videosCommand.list()
+        const { data } = await servers[1].videos.list()
 
         // Server 1 should not have these comments on videos of server 1
         for (const video of data) {
-          const { data } = await servers[1].commentsCommand.listThreads({ videoId: video.id })
+          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) {
@@ -92,30 +92,30 @@ describe('Test bulk actions', function () {
     before(async function () {
       this.timeout(120000)
 
-      await servers[0].videosCommand.upload({ attributes: { name: 'video 1 server 1' } })
-      await servers[0].videosCommand.upload({ attributes: { name: 'video 2 server 1' } })
-      await servers[0].videosCommand.upload({ token: user1Token, attributes: { 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 servers[1].videosCommand.upload({ attributes: { name: 'video 1 server 2' } })
+      await servers[1].videos.upload({ attributes: { name: 'video 1 server 2' } })
 
       await waitJobs(servers)
 
       {
-        const { data } = await servers[0].videosCommand.list()
+        const { data } = await servers[0].videos.list()
         for (const video of 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' })
+          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 { data } = await servers[1].videosCommand.list()
+        const { data } = await servers[1].videos.list()
 
         for (const video of data) {
-          await servers[1].commentsCommand.createThread({ videoId: video.id, text: 'comment by root server 2' })
+          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 })
         }
       }
@@ -137,10 +137,10 @@ describe('Test bulk actions', function () {
       await waitJobs(servers)
 
       for (const server of servers) {
-        const { data } = await server.videosCommand.list()
+        const { data } = await server.videos.list()
 
         for (const video of data) {
-          const { data } = await server.commentsCommand.listThreads({ videoId: video.id })
+          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
@@ -168,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,