1 files changed, 19 insertions, 32 deletions

diff --git a/server/tests/plugins/translations.ts b/server/tests/plugins/translations.ts
index 9fd2ba1c5..8b25c6b75 100644
--- a/server/tests/plugins/translations.ts
+++ b/server/tests/plugins/translations.ts
@@ -1,50 +1,37 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { cleanupTests, flushAndRunServer, ServerInfo } from '../../../shared/extra-utils/server/servers'
-import {
-  getPluginTestPath,
-  getPluginTranslations,
-  installPlugin,
-  setAccessTokensToServers,
-  uninstallPlugin
-} from '../../../shared/extra-utils'
+import * as chai from 'chai'
+import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers } from '@shared/extra-utils'
 
 const expect = chai.expect
 
 describe('Test plugin translations', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
+  let command: PluginsCommand
 
   before(async function () {
     this.timeout(30000)
 
-    server = await flushAndRunServer(1)
+    server = await createSingleServer(1)
     await setAccessTokensToServers([ server ])
 
-    await installPlugin({
-      url: server.url,
-      accessToken: server.accessToken,
-      path: getPluginTestPath()
-    })
+    command = server.plugins
 
-    await installPlugin({
-      url: server.url,
-      accessToken: server.accessToken,
-      path: getPluginTestPath('-filter-translations')
-    })
+    await command.install({ path: PluginsCommand.getPluginTestPath() })
+    await command.install({ path: PluginsCommand.getPluginTestPath('-filter-translations') })
   })
 
   it('Should not have translations for locale pt', async function () {
-    const res = await getPluginTranslations({ url: server.url, locale: 'pt' })
+    const body = await command.getTranslations({ locale: 'pt' })
 
-    expect(res.body).to.deep.equal({})
+    expect(body).to.deep.equal({})
   })
 
   it('Should have translations for locale fr', async function () {
-    const res = await getPluginTranslations({ url: server.url, locale: 'fr-FR' })
+    const body = await command.getTranslations({ locale: 'fr-FR' })
 
-    expect(res.body).to.deep.equal({
+    expect(body).to.deep.equal({
       'peertube-plugin-test': {
         Hi: 'Coucou'
       },
@@ -55,9 +42,9 @@ describe('Test plugin translations', function () {
   })
 
   it('Should have translations of locale it', async function () {
-    const res = await getPluginTranslations({ url: server.url, locale: 'it-IT' })
+    const body = await command.getTranslations({ locale: 'it-IT' })
 
-    expect(res.body).to.deep.equal({
+    expect(body).to.deep.equal({
       'peertube-plugin-test-filter-translations': {
         'Hello world': 'Ciao, mondo!'
       }
@@ -65,12 +52,12 @@ describe('Test plugin translations', function () {
   })
 
   it('Should remove the plugin and remove the locales', async function () {
-    await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-filter-translations' })
+    await command.uninstall({ npmName: 'peertube-plugin-test-filter-translations' })
 
     {
-      const res = await getPluginTranslations({ url: server.url, locale: 'fr-FR' })
+      const body = await command.getTranslations({ locale: 'fr-FR' })
 
-      expect(res.body).to.deep.equal({
+      expect(body).to.deep.equal({
         'peertube-plugin-test': {
           Hi: 'Coucou'
         }
@@ -78,9 +65,9 @@ describe('Test plugin translations', function () {
     }
 
     {
-      const res = await getPluginTranslations({ url: server.url, locale: 'it-IT' })
+      const body = await command.getTranslations({ locale: 'it-IT' })
 
-      expect(res.body).to.deep.equal({})
+      expect(body).to.deep.equal({})
     }
   })