X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=shared%2Fextra-utils%2Fmiscs%2Fchecks.ts;h=b1be214b1848f04a9925379749338dbb5eff778c;hb=62549e6c9818f422698f030e0b242609115493ed;hp=86b861cd2b92ae83e1107ab2c95a8b1f1216ea5b;hpb=6c5065a011b099618681a37bd77eaa7bd3db752e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts
index 86b861cd2..b1be214b1 100644
--- a/shared/extra-utils/miscs/checks.ts
+++ b/shared/extra-utils/miscs/checks.ts
@@ -4,9 +4,9 @@ import { expect } from 'chai'
 import { pathExists, readFile } from 'fs-extra'
 import { join } from 'path'
 import { root } from '@server/helpers/core-utils'
-import { HttpStatusCode } from '@shared/core-utils'
+import { HttpStatusCode } from '@shared/models'
 import { makeGetRequest } from '../requests'
-import { ServerInfo } from '../server'
+import { PeerTubeServer } from '../server'
 
 // Default interval -> 5 minutes
 function dateIsValid (dateString: string, interval = 300000) {
@@ -16,11 +16,21 @@ function dateIsValid (dateString: string, interval = 300000) {
   return Math.abs(now.getTime() - dateToCheck.getTime()) <= interval
 }
 
+function expectStartWith (str: string, start: string) {
+  expect(str.startsWith(start), `${str} does not start with ${start}`).to.be.true
+}
+
+async function expectLogDoesNotContain (server: PeerTubeServer, str: string) {
+  const content = await server.servers.getLogContent()
+
+  expect(content.toString()).to.not.contain(str)
+}
+
 async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') {
   const res = await makeGetRequest({
     url,
     path: imagePath,
-    statusCodeExpected: HttpStatusCode.OK_200
+    expectedStatus: HttpStatusCode.OK_200
   })
 
   const body = res.body
@@ -33,8 +43,8 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
   expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture')
 }
 
-async function testFileExistsOrNot (server: ServerInfo, directory: string, filePath: string, exist: boolean) {
-  const base = server.serversCommand.buildDirectory(directory)
+async function testFileExistsOrNot (server: PeerTubeServer, directory: string, filePath: string, exist: boolean) {
+  const base = server.servers.buildDirectory(directory)
 
   expect(await pathExists(join(base, filePath))).to.equal(exist)
 }
@@ -42,5 +52,7 @@ async function testFileExistsOrNot (server: ServerInfo, directory: string, fileP
 export {
   dateIsValid,
   testImage,
-  testFileExistsOrNot
+  expectLogDoesNotContain,
+  testFileExistsOrNot,
+  expectStartWith
 }