aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/api/videos/video-channels.ts
diff options
context:
space:
mode:
authorbuoyantair <buoyantair@protonmail.com>2018-11-20 12:28:13 +0530
committerbuoyantair <buoyantair@protonmail.com>2018-11-20 12:28:13 +0530
commitbc22d60899e14631cba0fb6450f4e85fc9528293 (patch)
tree285fa55033bc065df803adc2e4e3142fdfdd7309 /server/tests/api/videos/video-channels.ts
parentb9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff)
parentd216b5387fb774d1355df3ace002f7be469bd450 (diff)
downloadPeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz
PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst
PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'server/tests/api/videos/video-channels.ts')
-rw-r--r--server/tests/api/videos/video-channels.ts6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 5bffffc66..63514d69c 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -7,10 +7,12 @@ import {
7 createUser, 7 createUser,
8 doubleFollow, 8 doubleFollow,
9 flushAndRunMultipleServers, 9 flushAndRunMultipleServers,
10 getVideoChannelVideos, serverLogin, testImage, 10 getVideoChannelVideos,
11 testImage,
11 updateVideo, 12 updateVideo,
12 updateVideoChannelAvatar, 13 updateVideoChannelAvatar,
13 uploadVideo, wait, userLogin 14 uploadVideo,
15 userLogin
14} from '../../../../shared/utils' 16} from '../../../../shared/utils'
15import { 17import {
16 addVideoChannel, 18 addVideoChannel,