Introduce user command

4 files changed, 7 insertions, 11 deletions

diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index e055b4684..a0c149ac0 100644
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -8,11 +8,9 @@ import {
   buildAbsoluteFixturePath,
   cleanupTests,
   CLICommand,
-  createUser,
   doubleFollow,
   flushAndRunServer,
   getLocalIdByUUID,
-  getMyUserInformation,
   getVideo,
   getVideosList,
   ImportsCommand,
@@ -38,7 +36,7 @@ describe('Test CLI wrapper', function () {
     server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
 
-    await createUser({ url: server.url, accessToken: server.accessToken, username: 'user_1', password: 'super_password' })
+    await server.usersCommand.create({ username: 'user_1', password: 'super_password' })
 
     userAccessToken = await server.loginCommand.getAccessToken({ username: 'user_1', password: 'super_password' })
 
@@ -56,8 +54,8 @@ describe('Test CLI wrapper', function () {
       const stdout = await cliCommand.execWithEnv(`${cmd} token --url ${server.url} --username user_1 --password super_password`)
       const token = stdout.trim()
 
-      const res = await getMyUserInformation(server.url, token)
-      expect(res.body.username).to.equal('user_1')
+      const body = await server.usersCommand.getMyInfo({ token })
+      expect(body.username).to.equal('user_1')
     })
 
     it('Should display no selected instance', async function () {
diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts
index 68a59a41d..b45049964 100644
--- a/server/tests/cli/prune-storage.ts
+++ b/server/tests/cli/prune-storage.ts
@@ -16,7 +16,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   setDefaultVideoChannel,
-  updateMyAvatar,
   uploadVideo,
   wait,
   waitJobs
@@ -73,7 +72,7 @@ describe('Test prune storage scripts', function () {
       await uploadVideo(server.url, server.accessToken, { name: 'video 1' })
       await uploadVideo(server.url, server.accessToken, { name: 'video 2' })
 
-      await updateMyAvatar({ url: server.url, accessToken: server.accessToken, fixture: 'avatar.png' })
+      await server.usersCommand.updateMyAvatar({ fixture: 'avatar.png' })
 
       await server.playlistsCommand.create({
         attributes: {
diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts
index a5f958bf7..5e1e1c2af 100644
--- a/server/tests/cli/reset-password.ts
+++ b/server/tests/cli/reset-password.ts
@@ -1,5 +1,5 @@
 import 'mocha'
-import { cleanupTests, CLICommand, createUser, flushAndRunServer, ServerInfo, setAccessTokensToServers } from '../../../shared/extra-utils'
+import { cleanupTests, CLICommand, flushAndRunServer, ServerInfo, setAccessTokensToServers } from '../../../shared/extra-utils'
 
 describe('Test reset password scripts', function () {
   let server: ServerInfo
@@ -9,7 +9,7 @@ describe('Test reset password scripts', function () {
     server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
 
-    await createUser({ url: server.url, accessToken: server.accessToken, username: 'user_1', password: 'super password' })
+    await server.usersCommand.create({ username: 'user_1', password: 'super password' })
   })
 
   it('Should change the user password from CLI', async function () {
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index e986a04f2..b857fcf28 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -4,7 +4,6 @@ import 'mocha'
 import { expect } from 'chai'
 import {
   cleanupTests,
-  createUser,
   flushAndRunServer,
   getVideo,
   getVideosList,
@@ -41,7 +40,7 @@ describe('Test update host scripts', function () {
     await uploadVideo(server.url, server.accessToken, videoAttributes)
 
     // Create a user
-    await createUser({ url: server.url, accessToken: server.accessToken, username: 'toto', password: 'coucou' })
+    await server.usersCommand.create({ username: 'toto', password: 'coucou' })
 
     // Create channel
     const videoChannel = {