X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fhomepage.ts;h=e7de6bfee985f028f1beaa6c8e43d89f20138d3c;hb=d0800f7661f13fabe7bb6f4aa0ea50764f106405;hp=4a3ec0479d386f3d054c72cf898297a962ebd1f8;hpb=e8bd7ce7ccafe3e064b03978e9b512c1a4cc99e6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/homepage.ts b/server/tests/api/server/homepage.ts
index 4a3ec0479..e7de6bfee 100644
--- a/server/tests/api/server/homepage.ts
+++ b/server/tests/api/server/homepage.ts
@@ -2,39 +2,39 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { HttpStatusCode } from '@shared/core-utils'
-import { ServerConfig } from '@shared/models'
+import { HttpStatusCode } from '@shared/models'
 import {
   cleanupTests,
+  createSingleServer,
   CustomPagesCommand,
-  flushAndRunServer,
-  getConfig,
   killallServers,
-  reRunServer,
-  ServerInfo,
-  setAccessTokensToServers
-} from '../../../../shared/extra-utils/index'
+  PeerTubeServer,
+  setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
+} from '../../../../shared/server-commands/index'
 
 const expect = chai.expect
 
-async function getHomepageState (server: ServerInfo) {
-  const res = await getConfig(server.url)
+async function getHomepageState (server: PeerTubeServer) {
+  const config = await server.config.getConfig()
 
-  const config = res.body as ServerConfig
   return config.homepage.enabled
 }
 
 describe('Test instance homepage actions', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
   let command: CustomPagesCommand
 
   before(async function () {
     this.timeout(30000)
 
-    server = await flushAndRunServer(1)
+    server = await createSingleServer(1)
     await setAccessTokensToServers([ server ])
+    await setDefaultChannelAvatar(server)
+    await setDefaultAccountAvatar(server)
 
-    command = server.customPageCommand
+    command = server.customPage
   })
 
   it('Should not have a homepage', async function () {
@@ -57,9 +57,9 @@ describe('Test instance homepage actions', function () {
   it('Should have the same homepage after a restart', async function () {
     this.timeout(30000)
 
-    killallServers([ server ])
+    await killallServers([ server ])
 
-    await reRunServer(server)
+    await server.run()
 
     const page = await command.getInstanceHomepage()
     expect(page.content).to.equal('<picsou-magazine></picsou-magazine>')