X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fupdate-host.ts;h=09a3dd1e7a181c47d622e3da780ff405843628ff;hb=a54618880c394ad7571f3f3222dc96ec2dd10d9a;hp=2070f16f57176c456a6f8f9ec2ed103bc226b986;hpb=4c1def5fd8e9f483238eb38e221f555e2e6bbf07;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 2070f16f5..09a3dd1e7 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -1,28 +1,23 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-import * as chai from 'chai'
-import { VideoDetails } from '../../../shared/models/videos'
-import { waitJobs } from '../../../shared/extra-utils/server/jobs'
-import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments'
 import {
-  addVideoChannel,
+  addVideoCommentThread,
   cleanupTests,
   createUser,
-  execCLI,
   flushAndRunServer,
-  getEnvCli,
   getVideo,
-  getVideoChannelsList,
   getVideosList,
   killallServers,
   makeActivityPubGetRequest,
-  parseTorrentVideo, reRunServer,
+  parseTorrentVideo,
+  reRunServer,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo
-} from '../../../shared/extra-utils'
-import { getAccountsList } from '../../../shared/extra-utils/users/accounts'
+  uploadVideo,
+  waitJobs
+} from '@shared/extra-utils'
+import { VideoDetails } from '@shared/models'
 
 const expect = chai.expect
 
@@ -56,7 +51,7 @@ describe('Test update host scripts', function () {
       displayName: 'second video channel',
       description: 'super video channel description'
     }
-    await addVideoChannel(server.url, server.accessToken, videoChannel)
+    await server.channelsCommand.create({ attributes: videoChannel })
 
     // Create comments
     const text = 'my super first comment'
@@ -72,8 +67,7 @@ describe('Test update host scripts', function () {
     // Run server with standard configuration
     await reRunServer(server)
 
-    const env = getEnvCli(server)
-    await execCLI(`${env} npm run update-host`)
+    await server.cliCommand.execWithEnv(`npm run update-host`)
   })
 
   it('Should have updated videos url', async function () {
@@ -95,10 +89,10 @@ describe('Test update host scripts', function () {
   })
 
   it('Should have updated video channels url', async function () {
-    const res = await getVideoChannelsList(server.url, 0, 5, '-name')
-    expect(res.body.total).to.equal(3)
+    const { data, total } = await server.channelsCommand.list({ sort: '-name' })
+    expect(total).to.equal(3)
 
-    for (const channel of res.body.data) {
+    for (const channel of data) {
       const { body } = await makeActivityPubGetRequest(server.url, '/video-channels/' + channel.name)
 
       expect(body.id).to.equal('http://localhost:9002/video-channels/' + channel.name)
@@ -106,10 +100,10 @@ describe('Test update host scripts', function () {
   })
 
   it('Should have updated accounts url', async function () {
-    const res = await getAccountsList(server.url)
-    expect(res.body.total).to.equal(3)
+    const body = await server.accountsCommand.list()
+    expect(body.total).to.equal(3)
 
-    for (const account of res.body.data) {
+    for (const account of body.data) {
       const usernameWithDomain = account.name
       const { body } = await makeActivityPubGetRequest(server.url, '/accounts/' + usernameWithDomain)