Merge branch 'next' into develop

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

diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts
index 5ab4a85d7758bb6d336f3f5b93879b91531eca32..422a75d6e1814ec802f66694c6d59ae878ad7975 100644 (file)
--- a/server/tests/api/activitypub/fetch.ts
+++ b/server/tests/api/activitypub/fetch.ts
@@ -2,43 +2,43 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { cleanupTests, doubleFollow, flushAndRunMultipleServers, ServerInfo, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
 
 const expect = chai.expect
 
 describe('Test ActivityPub fetcher', function () {
-  let servers: ServerInfo[]
+  let servers: PeerTubeServer[]
 
   // ---------------------------------------------------------------
 
   before(async function () {
     this.timeout(60000)
 
-    servers = await flushAndRunMultipleServers(3)
+    servers = await createMultipleServers(3)
 
     // Get the access tokens
     await setAccessTokensToServers(servers)
 
     const user = { username: 'user1', password: 'password' }
     for (const server of servers) {
-      await server.usersCommand.create({ username: user.username, password: user.password })
+      await server.users.create({ username: user.username, password: user.password })
     }
 
-    const userAccessToken = await servers[0].loginCommand.getAccessToken(user)
+    const userAccessToken = await servers[0].login.getAccessToken(user)
 
-    await servers[0].videosCommand.upload({ attributes: { name: 'video root' } })
-    const { uuid } = await servers[0].videosCommand.upload({ attributes: { name: 'bad video root' } })
-    await servers[0].videosCommand.upload({ token: userAccessToken, attributes: { name: 'video user' } })
+    await servers[0].videos.upload({ attributes: { name: 'video root' } })
+    const { uuid } = await servers[0].videos.upload({ attributes: { name: 'bad video root' } })
+    await servers[0].videos.upload({ token: userAccessToken, attributes: { name: 'video user' } })
 
     {
       const to = 'http://localhost:' + servers[0].port + '/accounts/user1'
       const value = 'http://localhost:' + servers[1].port + '/accounts/user1'
-      await servers[0].sqlCommand.setActorField(to, 'url', value)
+      await servers[0].sql.setActorField(to, 'url', value)
     }
 
     {
       const value = 'http://localhost:' + servers[2].port + '/videos/watch/' + uuid
-      await servers[0].sqlCommand.setVideoField(uuid, 'url', value)
+      await servers[0].sql.setVideoField(uuid, 'url', value)
     }
   })
 
@@ -49,7 +49,7 @@ describe('Test ActivityPub fetcher', function () {
     await waitJobs(servers)
 
     {
-      const { total, data } = await servers[0].videosCommand.list({ sort: 'createdAt' })
+      const { total, data } = await servers[0].videos.list({ sort: 'createdAt' })
 
       expect(total).to.equal(3)
       expect(data[0].name).to.equal('video root')
@@ -58,7 +58,7 @@ describe('Test ActivityPub fetcher', function () {
     }
 
     {
-      const { total, data } = await servers[1].videosCommand.list({ sort: 'createdAt' })
+      const { total, data } = await servers[1].videos.list({ sort: 'createdAt' })
 
       expect(total).to.equal(1)
       expect(data[0].name).to.equal('video root')