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/video-channels.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/video-channels.ts')
| -rw-r--r-- | server/tests/api/videos/video-channels.ts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 8138c65d6..63514d69c 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts | |||
| @@ -7,11 +7,13 @@ 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, |
| 14 | } from '../../utils' | 15 | userLogin |
| 16 | } from '../../../../shared/utils' | ||
| 15 | import { | 17 | import { |
| 16 | addVideoChannel, | 18 | addVideoChannel, |
| 17 | deleteVideoChannel, | 19 | deleteVideoChannel, |
| @@ -24,8 +26,8 @@ import { | |||
| 24 | ServerInfo, | 26 | ServerInfo, |
| 25 | setAccessTokensToServers, | 27 | setAccessTokensToServers, |
| 26 | updateVideoChannel | 28 | updateVideoChannel |
| 27 | } from '../../utils/index' | 29 | } from '../../../../shared/utils/index' |
| 28 | import { waitJobs } from '../../utils/server/jobs' | 30 | import { waitJobs } from '../../../../shared/utils/server/jobs' |
| 29 | 31 | ||
| 30 | const expect = chai.expect | 32 | const expect = chai.expect |
| 31 | 33 | ||