diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /server/tests/api/videos/services.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'server/tests/api/videos/services.ts')
| -rw-r--r-- | server/tests/api/videos/services.ts | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts index 2f1424292..2da86964f 100644 --- a/server/tests/api/videos/services.ts +++ b/server/tests/api/videos/services.ts | |||
| @@ -2,8 +2,16 @@ | |||
| 2 | 2 | ||
| 3 | import * as chai from 'chai' | 3 | import * as chai from 'chai' |
| 4 | import 'mocha' | 4 | import 'mocha' |
| 5 | import { flushTests, getOEmbed, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index' | 5 | import { |
| 6 | import { runServer } from '../../utils/server/servers' | 6 | flushTests, |
| 7 | getOEmbed, | ||
| 8 | getVideosList, | ||
| 9 | killallServers, | ||
| 10 | ServerInfo, | ||
| 11 | setAccessTokensToServers, | ||
| 12 | uploadVideo | ||
| 13 | } from '../../../../shared/utils/index' | ||
| 14 | import { runServer } from '../../../../shared/utils/server/servers' | ||
| 7 | 15 | ||
| 8 | const expect = chai.expect | 16 | const expect = chai.expect |
| 9 | 17 | ||