X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fno-client.ts;h=d589f51f3e6ef1b6ccd4013fb32f3cf4666bb724;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=3b95ce945bab0dd456df09f458cf911b3bafa662;hpb=b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/no-client.ts b/server/tests/api/server/no-client.ts index 3b95ce945..d589f51f3 100644 --- a/server/tests/api/server/no-client.ts +++ b/server/tests/api/server/no-client.ts @@ -1,11 +1,8 @@ import 'mocha' import * as request from 'supertest' -import { - flushTests, - killallServers, - ServerInfo -} from '../../../../shared/utils' -import { runServer } from '../../../../shared/utils/server/servers' +import { ServerInfo } from '../../../../shared/extra-utils' +import { cleanupTests, flushAndRunServer } from '../../../../shared/extra-utils/server/servers' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' describe('Start and stop server without web client routes', function () { let server: ServerInfo @@ -13,24 +10,17 @@ describe('Start and stop server without web client routes', function () { before(async function () { this.timeout(30000) - await flushTests() - - server = await runServer(1, {}, ['--no-client']) + server = await flushAndRunServer(1, {}, [ '--no-client' ]) }) it('Should fail getting the client', function () { const req = request(server.url) .get('/') - return req.expect(404) + return req.expect(HttpStatusCode.NOT_FOUND_404) }) after(async function () { - killallServers([ server ]) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests([ server ]) }) })