X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=670bc67016927c9541c157822ea85b362c5e0bd7;hb=1fdf8edb77008133e80e5ab8e846b7f8fdfecf12;hp=48f2ee4fcefc4b57a4acaf08985f94e49dcf16c0;hpb=590fb5069038e69898123bb795f789683216d837;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/client.ts b/server/tests/client.ts
index 48f2ee4fc..670bc6701 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -1,21 +1,20 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
 import * as chai from 'chai'
 import * as request from 'supertest'
 import {
-  flushTests,
+  cleanupTests,
+  flushAndRunServer,
   getCustomConfig,
   getVideosList,
-  killallServers,
   makeHTMLRequest,
-  runServer,
   ServerInfo,
   serverLogin,
   updateCustomConfig,
   updateCustomSubConfig,
   uploadVideo
-} from './utils'
+} from '../../shared/extra-utils'
 
 const expect = chai.expect
 
@@ -31,9 +30,7 @@ describe('Test a client controllers', function () {
   before(async function () {
     this.timeout(120000)
 
-    await flushTests()
-
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
     server.accessToken = await serverLogin(server)
 
     const videoAttributes = {
@@ -115,14 +112,19 @@ describe('Test a client controllers', function () {
   it('Should have valid index html tags (title, description...)', async function () {
     const res = await makeHTMLRequest(server.url, '/videos/trending')
 
-    const description = 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' +
-      'with WebTorrent and Angular.'
+    const description = 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
     checkIndexTags(res.text, 'PeerTube', description, '')
   })
 
   it('Should update the customized configuration and have the correct index html tags', async function () {
     await updateCustomSubConfig(server.url, server.accessToken, {
       instance: {
+        name: 'PeerTube updated',
+        shortDescription: 'my short description',
+        description: 'my super description',
+        terms: 'my super terms',
+        defaultClientRoute: '/videos/recently-added',
+        defaultNSFWPolicy: 'blur',
         customizations: {
           javascript: 'alert("coucou")',
           css: 'body { background-color: red; }'
@@ -142,6 +144,6 @@ describe('Test a client controllers', function () {
   })
 
   after(async function () {
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })