diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-24 10:53:40 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-24 16:26:23 +0200 |
commit | 210feb6cc484a6c5c63c98f770de34e223f944cb (patch) | |
tree | d1d841892a7ac87ac0d434194597606a375aaed1 /server/tests/client.ts | |
parent | 9cc8d43e37a61709e7275c2a799bdf976dd940ca (diff) | |
download | PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.gz PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.zst PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.zip |
Cleanup tests
Diffstat (limited to 'server/tests/client.ts')
-rw-r--r-- | server/tests/client.ts | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/server/tests/client.ts b/server/tests/client.ts index 116189510..cdf0ce2ce 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts | |||
@@ -9,7 +9,7 @@ import { | |||
9 | getVideosList, | 9 | getVideosList, |
10 | killallServers, | 10 | killallServers, |
11 | makeHTMLRequest, | 11 | makeHTMLRequest, |
12 | runServer, | 12 | flushAndRunServer, |
13 | ServerInfo, | 13 | ServerInfo, |
14 | serverLogin, | 14 | serverLogin, |
15 | updateCustomConfig, | 15 | updateCustomConfig, |
@@ -31,9 +31,7 @@ describe('Test a client controllers', function () { | |||
31 | before(async function () { | 31 | before(async function () { |
32 | this.timeout(120000) | 32 | this.timeout(120000) |
33 | 33 | ||
34 | await flushTests() | 34 | server = await flushAndRunServer(1) |
35 | |||
36 | server = await runServer(1) | ||
37 | server.accessToken = await serverLogin(server) | 35 | server.accessToken = await serverLogin(server) |
38 | 36 | ||
39 | const videoAttributes = { | 37 | const videoAttributes = { |
@@ -147,7 +145,7 @@ describe('Test a client controllers', function () { | |||
147 | checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }') | 145 | checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }') |
148 | }) | 146 | }) |
149 | 147 | ||
150 | after(async function () { | 148 | after(function () { |
151 | killallServers([ server ]) | 149 | killallServers([ server ]) |
152 | }) | 150 | }) |
153 | }) | 151 | }) |