shared/ typescript types dir server-commands

[github/Chocobozzz/PeerTube.git] / server / tests / cli / reset-password.ts

diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts
index 4c9f0c5f800ef65297f73abdc280aeed3055c432..34dedb11368a18f952528a0092ce63132040a2ef 100644 (file)
--- a/server/tests/cli/reset-password.ts
+++ b/server/tests/cli/reset-password.ts
@@ -1,40 +1,27 @@
 import 'mocha'
-
-import {
-  createUser,
-  execCLI,
-  flushTests,
-  getEnvCli,
-  killallServers,
-  login,
-  runServer,
-  ServerInfo,
-  setAccessTokensToServers
-} from '../../../shared/utils'
+import { cleanupTests, CLICommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '../../../shared/server-commands'
 
 describe('Test reset password scripts', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
 
   before(async function () {
     this.timeout(30000)
-
-    await flushTests()
-    server = await runServer(1)
+    server = await createSingleServer(1)
     await setAccessTokensToServers([ server ])
 
-    await createUser({ url: server.url, accessToken: server.accessToken, username: 'user_1', password: 'super password' })
+    await server.users.create({ username: 'user_1', password: 'super password' })
   })
 
   it('Should change the user password from CLI', async function () {
     this.timeout(60000)
 
-    const env = getEnvCli(server)
-    await execCLI(`echo coucou | ${env} npm run reset-password -- -u user_1`)
+    const env = server.cli.getEnv()
+    await CLICommand.exec(`echo coucou | ${env} npm run reset-password -- -u user_1`)
 
-    await login(server.url, server.client, { username: 'user_1', password: 'coucou' }, 200)
+    await server.login.login({ user: { username: 'user_1', password: 'coucou' } })
   })
 
   after(async function () {
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })