diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/tests/api/videos/services.ts | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
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 | ||