From 7bc29171456ffa91c7ec8dc77e892c7dca359989 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 11 Jan 2018 11:40:18 +0100 Subject: Add tests to handle down server --- server/tests/utils/server/servers.ts | 10 +++++++++- server/tests/utils/videos/videos.ts | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'server/tests/utils') diff --git a/server/tests/utils/server/servers.ts b/server/tests/utils/server/servers.ts index 4add2f69a..878efe91a 100644 --- a/server/tests/utils/server/servers.ts +++ b/server/tests/utils/server/servers.ts @@ -145,6 +145,13 @@ function runServer (serverNumber: number, configOverride?: Object) { }) } +async function reRunServer (server: ServerInfo) { + const newServer = await runServer(server.serverNumber) + server.app = newServer.app + + return server +} + function killallServers (servers: ServerInfo[]) { for (const server of servers) { process.kill(-server.app.pid) @@ -158,5 +165,6 @@ export { flushAndRunMultipleServers, flushTests, runServer, - killallServers + killallServers, + reRunServer } diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index c437c21b2..dc1327215 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts @@ -383,7 +383,8 @@ async function completeVideoCheck ( expect(videoDetails.account.name).to.equal(attributes.account) expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) - expect(videoDetails.channel.name).to.equal(attributes.channel.name) + expect(videoDetails.channel.displayName).to.equal(attributes.channel.name) + expect(videoDetails.channel.name).to.have.lengthOf(36) expect(videoDetails.channel.isLocal).to.equal(attributes.channel.isLocal) expect(dateIsValid(videoDetails.channel.createdAt)).to.be.true expect(dateIsValid(videoDetails.channel.updatedAt)).to.be.true -- cgit v1.2.3