19 files changed, 74 insertions, 65 deletions

diff --git a/server/tests/api/check-params/services.ts b/server/tests/api/check-params/services.ts
index 780254df5..f82520574 100644
--- a/server/tests/api/check-params/services.ts
+++ b/server/tests/api/check-params/services.ts
@@ -9,7 +9,7 @@ import {
   setAccessTokensToServers,
   killallServers
 } from '../../utils'
-import { getVideosList, uploadVideo } from '../../utils/videos'
+import { getVideosList, uploadVideo } from '../../utils/videos/videos'
 
 describe('Test services API validators', function () {
   let server
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index e8d7ddf38..f3832bd2c 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -3,7 +3,7 @@
 import 'mocha'
 import * as request from 'supertest'
 import { flushTests, killallServers, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils'
-import { addVideoCommentThread } from '../../utils/video-comments'
+import { addVideoCommentThread } from '../../utils/videos/video-comments'
 
 describe('Test video comments API validator', function () {
   let pathThread: string
diff --git a/server/tests/api/index-fast.ts b/server/tests/api/index-fast.ts
index 35b414383..e591d0fd2 100644
--- a/server/tests/api/index-fast.ts
+++ b/server/tests/api/index-fast.ts
@@ -1,11 +1,11 @@
 // Order of the tests we want to execute
-import './config'
+import './server/config'
 import './check-params'
-import './users'
-import './single-server'
-import './video-abuse'
-import './video-blacklist'
-import './video-blacklist-management'
-import './video-description'
-import './video-privacy'
-import './services'
+import './users/users'
+import './videos/single-server'
+import './videos/video-abuse'
+import './videos/video-blacklist'
+import './videos/video-blacklist-management'
+import './videos/video-description'
+import './videos/video-privacy'
+import './videos/services'
diff --git a/server/tests/api/index-slow.ts b/server/tests/api/index-slow.ts
index b525d6f01..23b6526c7 100644
--- a/server/tests/api/index-slow.ts
+++ b/server/tests/api/index-slow.ts
@@ -1,7 +1,7 @@
 // Order of the tests we want to execute
 // import './multiple-servers'
-import './video-transcoder'
-import './multiple-servers'
-import './follows'
-import './jobs'
-import './video-comments'
+import './videos/video-transcoder'
+import './videos/multiple-servers'
+import './server/follows'
+import './server/jobs'
+import './videos/video-comments'
diff --git a/server/tests/api/config.ts b/server/tests/api/server/config.ts
index 61ae57977..e8846c8db 100644
--- a/server/tests/api/config.ts
+++ b/server/tests/api/server/config.ts
@@ -9,7 +9,7 @@ import {
   flushTests,
   runServer,
   registerUser
-} from '../utils'
+} from '../../utils/index'
 
 describe('Test config', function () {
   let server = null
diff --git a/server/tests/api/follows.ts b/server/tests/api/server/follows.ts
index 2ffa426a0..f77c0c67c 100644
--- a/server/tests/api/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -2,18 +2,21 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { VideoComment, VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model'
+import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 
 import {
   flushAndRunMultipleServers, flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo,
   wait
-} from '../utils'
-import { follow, getFollowersListPaginationAndSort, getFollowingListPaginationAndSort, unfollow } from '../utils/follows'
-import { getUserAccessToken } from '../utils/login'
-import { dateIsValid, webtorrentAdd } from '../utils/miscs'
-import { createUser } from '../utils/users'
-import { addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, getVideoThreadComments } from '../utils/video-comments'
-import { getVideo, rateVideo, testVideoImage } from '../utils/videos'
+} from '../../utils/index'
+import { dateIsValid, webtorrentAdd } from '../../utils/miscs/miscs'
+import { follow, getFollowersListPaginationAndSort, getFollowingListPaginationAndSort, unfollow } from '../../utils/server/follows'
+import { getUserAccessToken } from '../../utils/users/login'
+import { createUser } from '../../utils/users/users'
+import {
+  addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads,
+  getVideoThreadComments
+} from '../../utils/videos/video-comments'
+import { getVideo, rateVideo, testVideoImage } from '../../utils/videos/videos'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/jobs.ts b/server/tests/api/server/jobs.ts
index 4d9b61392..2e17e71a4 100644
--- a/server/tests/api/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -2,12 +2,12 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { flushTests, killallServers, ServerInfo, setAccessTokensToServers, wait } from '../utils'
-import { doubleFollow } from '../utils/follows'
-import { getJobsList, getJobsListPaginationAndSort } from '../utils/jobs'
-import { flushAndRunMultipleServers } from '../utils/servers'
-import { uploadVideo } from '../utils/videos'
-import { dateIsValid } from '../utils/miscs'
+import { flushTests, killallServers, ServerInfo, setAccessTokensToServers, wait } from '../../utils/index'
+import { doubleFollow } from '../../utils/server/follows'
+import { getJobsList, getJobsListPaginationAndSort } from '../../utils/server/jobs'
+import { flushAndRunMultipleServers } from '../../utils/server/servers'
+import { uploadVideo } from '../../utils/videos/videos'
+import { dateIsValid } from '../../utils/miscs/miscs'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/users.ts b/server/tests/api/users/users.ts
index 67e4cc8c6..2e3a0b94f 100644
--- a/server/tests/api/users.ts
+++ b/server/tests/api/users/users.ts
@@ -2,7 +2,7 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { UserRole } from '../../../shared'
+import { UserRole } from '../../../../shared/index'
 import {
   createUser,
   flushTests,
@@ -26,10 +26,10 @@ import {
   updateMyUser,
   updateUser,
   uploadVideo
-} from '../utils'
-import { follow } from '../utils/follows'
-import { getMyVideos } from '../utils/videos'
-import { setAccessTokensToServers } from '../utils/login'
+} from '../../utils/index'
+import { follow } from '../../utils/server/follows'
+import { getMyVideos } from '../../utils/videos/videos'
+import { setAccessTokensToServers } from '../../utils/users/login'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 06274d4cc..84f730a8e 100644
--- a/server/tests/api/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -4,16 +4,19 @@ import * as chai from 'chai'
 import 'mocha'
 import { join } from 'path'
 import * as request from 'supertest'
-import { VideoComment, VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model'
+import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 
 import {
   addVideoChannel, dateIsValid, doubleFollow, flushAndRunMultipleServers, flushTests, getUserAccessToken, getVideo,
   getVideoChannelsList, getVideosList, killallServers, rateVideo, removeVideo, ServerInfo, setAccessTokensToServers, testVideoImage,
   updateVideo, uploadVideo, wait, webtorrentAdd
-} from '../utils'
-import { createUser } from '../utils/users'
-import { addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, getVideoThreadComments } from '../utils/video-comments'
-import { viewVideo } from '../utils/videos'
+} from '../../utils/index'
+import { createUser } from '../../utils/users/users'
+import {
+  addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads,
+  getVideoThreadComments
+} from '../../utils/videos/video-comments'
+import { viewVideo } from '../../utils/videos/videos'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/services.ts b/server/tests/api/videos/services.ts
index 4d480c305..1cda464d9 100644
--- a/server/tests/api/services.ts
+++ b/server/tests/api/videos/services.ts
@@ -12,8 +12,8 @@ import {
   setAccessTokensToServers,
   killallServers,
   getOEmbed
-} from '../utils'
-import { runServer } from '../utils/servers'
+} from '../../utils/index'
+import { runServer } from '../../utils/server/servers'
 
 describe('Test services', function () {
   let server: ServerInfo = null
diff --git a/server/tests/api/single-server.ts b/server/tests/api/videos/single-server.ts
index 7f4351f5e..02723654d 100644
--- a/server/tests/api/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -30,8 +30,8 @@ import {
   uploadVideo,
   wait,
   webtorrentAdd
-} from '../utils'
-import { viewVideo } from '../utils/videos'
+} from '../../utils/index'
+import { viewVideo } from '../../utils/videos/videos'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/video-abuse.ts b/server/tests/api/videos/video-abuse.ts
index 4a0b6b504..3fcf5d8c7 100644
--- a/server/tests/api/video-abuse.ts
+++ b/server/tests/api/videos/video-abuse.ts
@@ -13,8 +13,8 @@ import {
   setAccessTokensToServers,
   uploadVideo,
   wait
-} from '../utils'
-import { doubleFollow } from '../utils/follows'
+} from '../../utils/index'
+import { doubleFollow } from '../../utils/server/follows'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/video-blacklist-management.ts b/server/tests/api/videos/video-blacklist-management.ts
index 0c636e094..db79784c2 100644
--- a/server/tests/api/video-blacklist-management.ts
+++ b/server/tests/api/videos/video-blacklist-management.ts
@@ -16,8 +16,8 @@ import {
   setAccessTokensToServers,
   uploadVideo,
   wait
-} from '../utils'
-import { doubleFollow } from '../utils/follows'
+} from '../../utils/index'
+import { doubleFollow } from '../../utils/server/follows'
 
 const expect = chai.expect
 const orderBy = lodash.orderBy
diff --git a/server/tests/api/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts
index 3afd8c510..d1cefa5d7 100644
--- a/server/tests/api/video-blacklist.ts
+++ b/server/tests/api/videos/video-blacklist.ts
@@ -13,8 +13,8 @@ import {
   setAccessTokensToServers,
   uploadVideo,
   wait
-} from '../utils'
-import { doubleFollow } from '../utils/follows'
+} from '../../utils/index'
+import { doubleFollow } from '../../utils/server/follows'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 2d8efb320..454a96da6 100644
--- a/server/tests/api/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -17,8 +17,8 @@ import {
   updateVideoChannel,
   deleteVideoChannel,
   getVideoChannel
-} from '../utils'
-import { User } from '../../../shared'
+} from '../../utils/index'
+import { User } from '../../../../shared/index'
 
 describe('Test a video channels', function () {
   let server: ServerInfo
diff --git a/server/tests/api/video-comments.ts b/server/tests/api/videos/video-comments.ts
index f05ca5e81..3b6578f04 100644
--- a/server/tests/api/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -2,9 +2,12 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { VideoComment, VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model'
-import { dateIsValid, flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../utils'
-import { addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, getVideoThreadComments } from '../utils/video-comments'
+import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import { dateIsValid, flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index'
+import {
+  addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads,
+  getVideoThreadComments
+} from '../../utils/videos/video-comments'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/video-description.ts b/server/tests/api/videos/video-description.ts
index 7ad1c63ae..c2985194c 100644
--- a/server/tests/api/video-description.ts
+++ b/server/tests/api/videos/video-description.ts
@@ -14,8 +14,8 @@ import {
   updateVideo,
   uploadVideo,
   wait
-} from '../utils'
-import { doubleFollow } from '../utils/follows'
+} from '../../utils/index'
+import { doubleFollow } from '../../utils/server/follows'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/video-privacy.ts b/server/tests/api/videos/video-privacy.ts
index 26847efce..de709f8f1 100644
--- a/server/tests/api/video-privacy.ts
+++ b/server/tests/api/videos/video-privacy.ts
@@ -2,7 +2,7 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { VideoPrivacy } from '../../../shared/models/videos/video-privacy.enum'
+import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
 import {
   flushAndRunMultipleServers,
   flushTests,
@@ -12,11 +12,11 @@ import {
   setAccessTokensToServers,
   uploadVideo,
   wait
-} from '../utils'
-import { doubleFollow } from '../utils/follows'
-import { getUserAccessToken } from '../utils/login'
-import { createUser } from '../utils/users'
-import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../utils/videos'
+} from '../../utils/index'
+import { doubleFollow } from '../../utils/server/follows'
+import { getUserAccessToken } from '../../utils/users/login'
+import { createUser } from '../../utils/users/users'
+import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../utils/videos/videos'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 9a6e91b76..27927a594 100644
--- a/server/tests/api/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -15,7 +15,7 @@ import {
   killallServers,
   webtorrentAdd,
   getVideo
-} from '../utils'
+} from '../../utils/index'
 
 describe('Test video transcoding', function () {
   let servers: ServerInfo[] = []