aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/activitypub/client.ts2
-rw-r--r--server/tests/api/activitypub/fetch.ts2
-rw-r--r--server/tests/api/activitypub/helpers.ts2
-rw-r--r--server/tests/api/activitypub/refresher.ts4
-rw-r--r--server/tests/api/activitypub/security.ts4
-rw-r--r--server/tests/api/check-params/accounts.ts6
-rw-r--r--server/tests/api/check-params/blocklist.ts4
-rw-r--r--server/tests/api/check-params/config.ts2
-rw-r--r--server/tests/api/check-params/contact-form.ts10
-rw-r--r--server/tests/api/check-params/debug.ts4
-rw-r--r--server/tests/api/check-params/follows.ts4
-rw-r--r--server/tests/api/check-params/jobs.ts6
-rw-r--r--server/tests/api/check-params/logs.ts4
-rw-r--r--server/tests/api/check-params/redundancy.ts2
-rw-r--r--server/tests/api/check-params/search.ts4
-rw-r--r--server/tests/api/check-params/services.ts2
-rw-r--r--server/tests/api/check-params/user-notifications.ts4
-rw-r--r--server/tests/api/check-params/user-subscriptions.ts6
-rw-r--r--server/tests/api/check-params/users.ts8
-rw-r--r--server/tests/api/check-params/video-abuses.ts4
-rw-r--r--server/tests/api/check-params/video-blacklist.ts4
-rw-r--r--server/tests/api/check-params/video-captions.ts4
-rw-r--r--server/tests/api/check-params/video-channels.ts4
-rw-r--r--server/tests/api/check-params/video-comments.ts6
-rw-r--r--server/tests/api/check-params/video-imports.ts6
-rw-r--r--server/tests/api/check-params/video-playlists.ts4
-rw-r--r--server/tests/api/check-params/videos-filter.ts2
-rw-r--r--server/tests/api/check-params/videos-history.ts2
-rw-r--r--server/tests/api/check-params/videos.ts6
-rw-r--r--server/tests/api/notifications/user-notifications.ts22
-rw-r--r--server/tests/api/redundancy/redundancy.ts8
-rw-r--r--server/tests/api/search/search-activitypub-video-channels.ts6
-rw-r--r--server/tests/api/search/search-activitypub-videos.ts4
-rw-r--r--server/tests/api/search/search-videos.ts2
-rw-r--r--server/tests/api/server/config.ts2
-rw-r--r--server/tests/api/server/contact-form.ts8
-rw-r--r--server/tests/api/server/email.ts6
-rw-r--r--server/tests/api/server/follow-constraints.ts8
-rw-r--r--server/tests/api/server/follows-moderation.ts6
-rw-r--r--server/tests/api/server/follows.ts22
-rw-r--r--server/tests/api/server/handle-down.ts8
-rw-r--r--server/tests/api/server/jobs.ts12
-rw-r--r--server/tests/api/server/logs.ts8
-rw-r--r--server/tests/api/server/no-client.ts4
-rw-r--r--server/tests/api/server/reverse-proxy.ts4
-rw-r--r--server/tests/api/server/stats.ts10
-rw-r--r--server/tests/api/server/tracker.ts4
-rw-r--r--server/tests/api/users/blocklist.ts12
-rw-r--r--server/tests/api/users/user-subscriptions.ts10
-rw-r--r--server/tests/api/users/users-multiple-servers.ts17
-rw-r--r--server/tests/api/users/users-verification.ts8
-rw-r--r--server/tests/api/users/users.ts8
-rw-r--r--server/tests/api/videos/multiple-servers.ts6
-rw-r--r--server/tests/api/videos/services.ts4
-rw-r--r--server/tests/api/videos/single-server.ts2
-rw-r--r--server/tests/api/videos/video-abuse.ts6
-rw-r--r--server/tests/api/videos/video-blacklist.ts6
-rw-r--r--server/tests/api/videos/video-captions.ts13
-rw-r--r--server/tests/api/videos/video-change-ownership.ts4
-rw-r--r--server/tests/api/videos/video-channels.ts6
-rw-r--r--server/tests/api/videos/video-comments.ts6
-rw-r--r--server/tests/api/videos/video-description.ts6
-rw-r--r--server/tests/api/videos/video-hls.ts2
-rw-r--r--server/tests/api/videos/video-imports.ts6
-rw-r--r--server/tests/api/videos/video-nsfw.ts10
-rw-r--r--server/tests/api/videos/video-playlists.ts2
-rw-r--r--server/tests/api/videos/video-privacy.ts12
-rw-r--r--server/tests/api/videos/video-schedule-update.ts4
-rw-r--r--server/tests/api/videos/video-transcoder.ts4
-rw-r--r--server/tests/api/videos/videos-filter.ts2
-rw-r--r--server/tests/api/videos/videos-history.ts4
-rw-r--r--server/tests/api/videos/videos-overview.ts4
-rw-r--r--server/tests/api/videos/videos-views-cleaner.ts6
-rw-r--r--server/tests/cli/create-import-video-file-job.ts4
-rw-r--r--server/tests/cli/create-transcoding-job.ts4
-rw-r--r--server/tests/cli/optimize-old-videos.ts4
-rw-r--r--server/tests/cli/peertube.ts2
-rw-r--r--server/tests/cli/reset-password.ts2
-rw-r--r--server/tests/cli/update-host.ts8
-rw-r--r--server/tests/client.ts2
-rw-r--r--server/tests/feeds/feeds.ts6
-rw-r--r--server/tests/helpers/request.ts2
-rw-r--r--server/tests/misc-endpoints.ts2
-rw-r--r--server/tests/real-world/populate-database.ts2
-rw-r--r--server/tests/real-world/real-world.ts4
-rw-r--r--server/tools/peertube-get-access-token.ts2
-rw-r--r--server/tools/peertube-import-videos.ts2
-rw-r--r--server/tools/peertube-upload.ts4
88 files changed, 249 insertions, 237 deletions
diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts
index 6d90d8643..52e7e27f8 100644
--- a/server/tests/api/activitypub/client.ts
+++ b/server/tests/api/activitypub/client.ts
@@ -11,7 +11,7 @@ import {
11 ServerInfo, 11 ServerInfo,
12 setAccessTokensToServers, 12 setAccessTokensToServers,
13 uploadVideo 13 uploadVideo
14} from '../../../../shared/utils' 14} from '../../../../shared/extra-utils'
15 15
16const expect = chai.expect 16const expect = chai.expect
17 17
diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts
index 9cbc7dd84..f9dba3418 100644
--- a/server/tests/api/activitypub/fetch.ts
+++ b/server/tests/api/activitypub/fetch.ts
@@ -17,7 +17,7 @@ import {
17 uploadVideo, 17 uploadVideo,
18 userLogin, 18 userLogin,
19 waitJobs 19 waitJobs
20} from '../../../../shared/utils' 20} from '../../../../shared/extra-utils'
21import * as chai from 'chai' 21import * as chai from 'chai'
22import { Video } from '../../../../shared/models/videos' 22import { Video } from '../../../../shared/models/videos'
23 23
diff --git a/server/tests/api/activitypub/helpers.ts b/server/tests/api/activitypub/helpers.ts
index ac6e755c3..365d0e1ae 100644
--- a/server/tests/api/activitypub/helpers.ts
+++ b/server/tests/api/activitypub/helpers.ts
@@ -2,7 +2,7 @@
2 2
3import 'mocha' 3import 'mocha'
4import { expect } from 'chai' 4import { expect } from 'chai'
5import { buildRequestStub } from '../../../../shared/utils/miscs/stubs' 5import { buildRequestStub } from '../../../../shared/extra-utils/miscs/stubs'
6import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto' 6import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto'
7import { cloneDeep } from 'lodash' 7import { cloneDeep } from 'lodash'
8import { buildSignedActivity } from '../../../helpers/activitypub' 8import { buildSignedActivity } from '../../../helpers/activitypub'
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts
index 665a9f9f0..7b08b1dab 100644
--- a/server/tests/api/activitypub/refresher.ts
+++ b/server/tests/api/activitypub/refresher.ts
@@ -20,8 +20,8 @@ import {
20 uploadVideoAndGetId, 20 uploadVideoAndGetId,
21 wait, 21 wait,
22 waitJobs 22 waitJobs
23} from '../../../../shared/utils' 23} from '../../../../shared/extra-utils'
24import { getAccount } from '../../../../shared/utils/users/accounts' 24import { getAccount } from '../../../../shared/extra-utils/users/accounts'
25import { VideoPlaylistPrivacy } from '../../../../shared/models/videos' 25import { VideoPlaylistPrivacy } from '../../../../shared/models/videos'
26 26
27describe('Test AP refresher', function () { 27describe('Test AP refresher', function () {
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index 2c55876ba..2346e9c8e 100644
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -9,12 +9,12 @@ import {
9 killallServers, 9 killallServers,
10 ServerInfo, 10 ServerInfo,
11 setActorField 11 setActorField
12} from '../../../../shared/utils' 12} from '../../../../shared/extra-utils'
13import { HTTP_SIGNATURE } from '../../../initializers/constants' 13import { HTTP_SIGNATURE } from '../../../initializers/constants'
14import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils' 14import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils'
15import * as chai from 'chai' 15import * as chai from 'chai'
16import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub' 16import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub'
17import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/utils/requests/activitypub' 17import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/extra-utils/requests/activitypub'
18 18
19const expect = chai.expect 19const expect = chai.expect
20 20
diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts
index 68f9519c6..4c145c41d 100644
--- a/server/tests/api/check-params/accounts.ts
+++ b/server/tests/api/check-params/accounts.ts
@@ -2,13 +2,13 @@
2 2
3import 'mocha' 3import 'mocha'
4 4
5import { flushTests, killallServers, runServer, ServerInfo } from '../../../../shared/utils' 5import { flushTests, killallServers, runServer, ServerInfo } from '../../../../shared/extra-utils'
6import { 6import {
7 checkBadCountPagination, 7 checkBadCountPagination,
8 checkBadSortPagination, 8 checkBadSortPagination,
9 checkBadStartPagination 9 checkBadStartPagination
10} from '../../../../shared/utils/requests/check-api-params' 10} from '../../../../shared/extra-utils/requests/check-api-params'
11import { getAccount } from '../../../../shared/utils/users/accounts' 11import { getAccount } from '../../../../shared/extra-utils/users/accounts'
12 12
13describe('Test accounts API validators', function () { 13describe('Test accounts API validators', function () {
14 const path = '/api/v1/accounts/' 14 const path = '/api/v1/accounts/'
diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts
index 62a2c2a52..6c7351d38 100644
--- a/server/tests/api/check-params/blocklist.ts
+++ b/server/tests/api/check-params/blocklist.ts
@@ -13,12 +13,12 @@ import {
13 makePostBodyRequest, 13 makePostBodyRequest,
14 ServerInfo, 14 ServerInfo,
15 setAccessTokensToServers, userLogin 15 setAccessTokensToServers, userLogin
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17import { 17import {
18 checkBadCountPagination, 18 checkBadCountPagination,
19 checkBadSortPagination, 19 checkBadSortPagination,
20 checkBadStartPagination 20 checkBadStartPagination
21} from '../../../../shared/utils/requests/check-api-params' 21} from '../../../../shared/extra-utils/requests/check-api-params'
22 22
23describe('Test blocklist API validators', function () { 23describe('Test blocklist API validators', function () {
24 let servers: ServerInfo[] 24 let servers: ServerInfo[]
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 3bcb015d9..ba07552cf 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -7,7 +7,7 @@ import { CustomConfig } from '../../../../shared/models/server/custom-config.mod
7import { 7import {
8 createUser, flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePutBodyRequest, runServer, ServerInfo, 8 createUser, flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePutBodyRequest, runServer, ServerInfo,
9 setAccessTokensToServers, userLogin, immutableAssign 9 setAccessTokensToServers, userLogin, immutableAssign
10} from '../../../../shared/utils' 10} from '../../../../shared/extra-utils'
11 11
12describe('Test config API validators', function () { 12describe('Test config API validators', function () {
13 const path = '/api/v1/config/custom' 13 const path = '/api/v1/config/custom'
diff --git a/server/tests/api/check-params/contact-form.ts b/server/tests/api/check-params/contact-form.ts
index c7e014b1f..9ba6136aa 100644
--- a/server/tests/api/check-params/contact-form.ts
+++ b/server/tests/api/check-params/contact-form.ts
@@ -10,15 +10,15 @@ import {
10 runServer, 10 runServer,
11 ServerInfo, 11 ServerInfo,
12 setAccessTokensToServers 12 setAccessTokensToServers
13} from '../../../../shared/utils' 13} from '../../../../shared/extra-utils'
14import { 14import {
15 checkBadCountPagination, 15 checkBadCountPagination,
16 checkBadSortPagination, 16 checkBadSortPagination,
17 checkBadStartPagination 17 checkBadStartPagination
18} from '../../../../shared/utils/requests/check-api-params' 18} from '../../../../shared/extra-utils/requests/check-api-params'
19import { getAccount } from '../../../../shared/utils/users/accounts' 19import { getAccount } from '../../../../shared/extra-utils/users/accounts'
20import { sendContactForm } from '../../../../shared/utils/server/contact-form' 20import { sendContactForm } from '../../../../shared/extra-utils/server/contact-form'
21import { MockSmtpServer } from '../../../../shared/utils/miscs/email' 21import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
22 22
23describe('Test contact form API validators', function () { 23describe('Test contact form API validators', function () {
24 let server: ServerInfo 24 let server: ServerInfo
diff --git a/server/tests/api/check-params/debug.ts b/server/tests/api/check-params/debug.ts
index da94beffe..8ba7e0430 100644
--- a/server/tests/api/check-params/debug.ts
+++ b/server/tests/api/check-params/debug.ts
@@ -10,8 +10,8 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 userLogin 12 userLogin
13} from '../../../../shared/utils' 13} from '../../../../shared/extra-utils'
14import { makeGetRequest } from '../../../../shared/utils/requests/requests' 14import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests'
15 15
16describe('Test debug API validators', function () { 16describe('Test debug API validators', function () {
17 const path = '/api/v1/server/debug' 17 const path = '/api/v1/server/debug'
diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts
index 5bb337682..e75631312 100644
--- a/server/tests/api/check-params/follows.ts
+++ b/server/tests/api/check-params/follows.ts
@@ -5,12 +5,12 @@ import 'mocha'
5import { 5import {
6 createUser, flushTests, killallServers, makeDeleteRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, 6 createUser, flushTests, killallServers, makeDeleteRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers,
7 userLogin 7 userLogin
8} from '../../../../shared/utils' 8} from '../../../../shared/extra-utils'
9import { 9import {
10 checkBadCountPagination, 10 checkBadCountPagination,
11 checkBadSortPagination, 11 checkBadSortPagination,
12 checkBadStartPagination 12 checkBadStartPagination
13} from '../../../../shared/utils/requests/check-api-params' 13} from '../../../../shared/extra-utils/requests/check-api-params'
14 14
15describe('Test server follows API validators', function () { 15describe('Test server follows API validators', function () {
16 let server: ServerInfo 16 let server: ServerInfo
diff --git a/server/tests/api/check-params/jobs.ts b/server/tests/api/check-params/jobs.ts
index 5fb2b9606..682406e87 100644
--- a/server/tests/api/check-params/jobs.ts
+++ b/server/tests/api/check-params/jobs.ts
@@ -10,13 +10,13 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 userLogin 12 userLogin
13} from '../../../../shared/utils' 13} from '../../../../shared/extra-utils'
14import { 14import {
15 checkBadCountPagination, 15 checkBadCountPagination,
16 checkBadSortPagination, 16 checkBadSortPagination,
17 checkBadStartPagination 17 checkBadStartPagination
18} from '../../../../shared/utils/requests/check-api-params' 18} from '../../../../shared/extra-utils/requests/check-api-params'
19import { makeGetRequest } from '../../../../shared/utils/requests/requests' 19import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests'
20 20
21describe('Test jobs API validators', function () { 21describe('Test jobs API validators', function () {
22 const path = '/api/v1/jobs/failed' 22 const path = '/api/v1/jobs/failed'
diff --git a/server/tests/api/check-params/logs.ts b/server/tests/api/check-params/logs.ts
index 9bc6ac244..0948f7c5e 100644
--- a/server/tests/api/check-params/logs.ts
+++ b/server/tests/api/check-params/logs.ts
@@ -10,8 +10,8 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 userLogin 12 userLogin
13} from '../../../../shared/utils' 13} from '../../../../shared/extra-utils'
14import { makeGetRequest } from '../../../../shared/utils/requests/requests' 14import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests'
15 15
16describe('Test logs API validators', function () { 16describe('Test logs API validators', function () {
17 const path = '/api/v1/server/logs' 17 const path = '/api/v1/server/logs'
diff --git a/server/tests/api/check-params/redundancy.ts b/server/tests/api/check-params/redundancy.ts
index d14e35cf2..93b905fea 100644
--- a/server/tests/api/check-params/redundancy.ts
+++ b/server/tests/api/check-params/redundancy.ts
@@ -12,7 +12,7 @@ import {
12 ServerInfo, 12 ServerInfo,
13 setAccessTokensToServers, 13 setAccessTokensToServers,
14 userLogin 14 userLogin
15} from '../../../../shared/utils' 15} from '../../../../shared/extra-utils'
16 16
17describe('Test server redundancy API validators', function () { 17describe('Test server redundancy API validators', function () {
18 let servers: ServerInfo[] 18 let servers: ServerInfo[]
diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts
index 7b7e07784..1fcdedd90 100644
--- a/server/tests/api/check-params/search.ts
+++ b/server/tests/api/check-params/search.ts
@@ -2,12 +2,12 @@
2 2
3import 'mocha' 3import 'mocha'
4 4
5import { flushTests, immutableAssign, killallServers, makeGetRequest, runServer, ServerInfo } from '../../../../shared/utils' 5import { flushTests, immutableAssign, killallServers, makeGetRequest, runServer, ServerInfo } from '../../../../shared/extra-utils'
6import { 6import {
7 checkBadCountPagination, 7 checkBadCountPagination,
8 checkBadSortPagination, 8 checkBadSortPagination,
9 checkBadStartPagination 9 checkBadStartPagination
10} from '../../../../shared/utils/requests/check-api-params' 10} from '../../../../shared/extra-utils/requests/check-api-params'
11 11
12describe('Test videos API validator', function () { 12describe('Test videos API validator', function () {
13 let server: ServerInfo 13 let server: ServerInfo
diff --git a/server/tests/api/check-params/services.ts b/server/tests/api/check-params/services.ts
index 28591af9d..813bc7e36 100644
--- a/server/tests/api/check-params/services.ts
+++ b/server/tests/api/check-params/services.ts
@@ -10,7 +10,7 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 uploadVideo 12 uploadVideo
13} from '../../../../shared/utils' 13} from '../../../../shared/extra-utils'
14 14
15describe('Test services API validators', function () { 15describe('Test services API validators', function () {
16 let server: ServerInfo 16 let server: ServerInfo
diff --git a/server/tests/api/check-params/user-notifications.ts b/server/tests/api/check-params/user-notifications.ts
index 4b75f6920..c56328406 100644
--- a/server/tests/api/check-params/user-notifications.ts
+++ b/server/tests/api/check-params/user-notifications.ts
@@ -14,12 +14,12 @@ import {
14 ServerInfo, 14 ServerInfo,
15 setAccessTokensToServers, 15 setAccessTokensToServers,
16 wait 16 wait
17} from '../../../../shared/utils' 17} from '../../../../shared/extra-utils'
18import { 18import {
19 checkBadCountPagination, 19 checkBadCountPagination,
20 checkBadSortPagination, 20 checkBadSortPagination,
21 checkBadStartPagination 21 checkBadStartPagination
22} from '../../../../shared/utils/requests/check-api-params' 22} from '../../../../shared/extra-utils/requests/check-api-params'
23import { UserNotificationSetting, UserNotificationSettingValue } from '../../../../shared/models/users' 23import { UserNotificationSetting, UserNotificationSettingValue } from '../../../../shared/models/users'
24 24
25describe('Test user notifications API validators', function () { 25describe('Test user notifications API validators', function () {
diff --git a/server/tests/api/check-params/user-subscriptions.ts b/server/tests/api/check-params/user-subscriptions.ts
index a18e1a43b..d33b3bca6 100644
--- a/server/tests/api/check-params/user-subscriptions.ts
+++ b/server/tests/api/check-params/user-subscriptions.ts
@@ -13,14 +13,14 @@ import {
13 ServerInfo, 13 ServerInfo,
14 setAccessTokensToServers, 14 setAccessTokensToServers,
15 userLogin 15 userLogin
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17 17
18import { 18import {
19 checkBadCountPagination, 19 checkBadCountPagination,
20 checkBadSortPagination, 20 checkBadSortPagination,
21 checkBadStartPagination 21 checkBadStartPagination
22} from '../../../../shared/utils/requests/check-api-params' 22} from '../../../../shared/extra-utils/requests/check-api-params'
23import { waitJobs } from '../../../../shared/utils/server/jobs' 23import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
24 24
25describe('Test user subscriptions API validators', function () { 25describe('Test user subscriptions API validators', function () {
26 const path = '/api/v1/users/me/subscriptions' 26 const path = '/api/v1/users/me/subscriptions'
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index b5c812e8f..b62806554 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -9,15 +9,15 @@ import {
9 createUser, flushTests, getMyUserInformation, getMyUserVideoRating, getUsersList, immutableAssign, killallServers, makeGetRequest, 9 createUser, flushTests, getMyUserInformation, getMyUserVideoRating, getUsersList, immutableAssign, killallServers, makeGetRequest,
10 makePostBodyRequest, makeUploadRequest, makePutBodyRequest, registerUser, removeUser, runServer, ServerInfo, setAccessTokensToServers, 10 makePostBodyRequest, makeUploadRequest, makePutBodyRequest, registerUser, removeUser, runServer, ServerInfo, setAccessTokensToServers,
11 updateUser, uploadVideo, userLogin, deleteMe, unblockUser, blockUser 11 updateUser, uploadVideo, userLogin, deleteMe, unblockUser, blockUser
12} from '../../../../shared/utils' 12} from '../../../../shared/extra-utils'
13import { 13import {
14 checkBadCountPagination, 14 checkBadCountPagination,
15 checkBadSortPagination, 15 checkBadSortPagination,
16 checkBadStartPagination 16 checkBadStartPagination
17} from '../../../../shared/utils/requests/check-api-params' 17} from '../../../../shared/extra-utils/requests/check-api-params'
18import { getMagnetURI, getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../../../shared/utils/videos/video-imports' 18import { getMagnetURI, getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
19import { VideoPrivacy } from '../../../../shared/models/videos' 19import { VideoPrivacy } from '../../../../shared/models/videos'
20import { waitJobs } from '../../../../shared/utils/server/jobs' 20import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
21import { expect } from 'chai' 21import { expect } from 'chai'
22import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' 22import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
23 23
diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts
index 7edc8e39d..78e4acf2f 100644
--- a/server/tests/api/check-params/video-abuses.ts
+++ b/server/tests/api/check-params/video-abuses.ts
@@ -15,12 +15,12 @@ import {
15 updateVideoAbuse, 15 updateVideoAbuse,
16 uploadVideo, 16 uploadVideo,
17 userLogin 17 userLogin
18} from '../../../../shared/utils' 18} from '../../../../shared/extra-utils'
19import { 19import {
20 checkBadCountPagination, 20 checkBadCountPagination,
21 checkBadSortPagination, 21 checkBadSortPagination,
22 checkBadStartPagination 22 checkBadStartPagination
23} from '../../../../shared/utils/requests/check-api-params' 23} from '../../../../shared/extra-utils/requests/check-api-params'
24import { VideoAbuseState } from '../../../../shared/models/videos' 24import { VideoAbuseState } from '../../../../shared/models/videos'
25 25
26describe('Test video abuses API validators', function () { 26describe('Test video abuses API validators', function () {
diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts
index 81423aee9..c2e9622cc 100644
--- a/server/tests/api/check-params/video-blacklist.ts
+++ b/server/tests/api/check-params/video-blacklist.ts
@@ -18,12 +18,12 @@ import {
18 setAccessTokensToServers, 18 setAccessTokensToServers,
19 uploadVideo, 19 uploadVideo,
20 userLogin, waitJobs 20 userLogin, waitJobs
21} from '../../../../shared/utils' 21} from '../../../../shared/extra-utils'
22import { 22import {
23 checkBadCountPagination, 23 checkBadCountPagination,
24 checkBadSortPagination, 24 checkBadSortPagination,
25 checkBadStartPagination 25 checkBadStartPagination
26} from '../../../../shared/utils/requests/check-api-params' 26} from '../../../../shared/extra-utils/requests/check-api-params'
27import { VideoDetails, VideoBlacklistType } from '../../../../shared/models/videos' 27import { VideoDetails, VideoBlacklistType } from '../../../../shared/models/videos'
28import { expect } from 'chai' 28import { expect } from 'chai'
29 29
diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts
index de2ca8cd1..4ef5e03ed 100644
--- a/server/tests/api/check-params/video-captions.ts
+++ b/server/tests/api/check-params/video-captions.ts
@@ -13,9 +13,9 @@ import {
13 setAccessTokensToServers, 13 setAccessTokensToServers,
14 uploadVideo, 14 uploadVideo,
15 userLogin 15 userLogin
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17import { join } from 'path' 17import { join } from 'path'
18import { createVideoCaption } from '../../../../shared/utils/videos/video-captions' 18import { createVideoCaption } from '../../../../shared/extra-utils/videos/video-captions'
19 19
20describe('Test video captions API validator', function () { 20describe('Test video captions API validator', function () {
21 const path = '/api/v1/videos/' 21 const path = '/api/v1/videos/'
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index b72fc4220..b6aa745ab 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -20,12 +20,12 @@ import {
20 ServerInfo, 20 ServerInfo,
21 setAccessTokensToServers, 21 setAccessTokensToServers,
22 userLogin 22 userLogin
23} from '../../../../shared/utils' 23} from '../../../../shared/extra-utils'
24import { 24import {
25 checkBadCountPagination, 25 checkBadCountPagination,
26 checkBadSortPagination, 26 checkBadSortPagination,
27 checkBadStartPagination 27 checkBadStartPagination
28} from '../../../../shared/utils/requests/check-api-params' 28} from '../../../../shared/extra-utils/requests/check-api-params'
29import { User } from '../../../../shared/models/users' 29import { User } from '../../../../shared/models/users'
30import { join } from 'path' 30import { join } from 'path'
31 31
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index 5f70998ef..b80d91279 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -6,13 +6,13 @@ import {
6 createUser, 6 createUser,
7 flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, 7 flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers,
8 uploadVideo, userLogin 8 uploadVideo, userLogin
9} from '../../../../shared/utils' 9} from '../../../../shared/extra-utils'
10import { 10import {
11 checkBadCountPagination, 11 checkBadCountPagination,
12 checkBadSortPagination, 12 checkBadSortPagination,
13 checkBadStartPagination 13 checkBadStartPagination
14} from '../../../../shared/utils/requests/check-api-params' 14} from '../../../../shared/extra-utils/requests/check-api-params'
15import { addVideoCommentThread } from '../../../../shared/utils/videos/video-comments' 15import { addVideoCommentThread } from '../../../../shared/extra-utils/videos/video-comments'
16 16
17const expect = chai.expect 17const expect = chai.expect
18 18
diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts
index 4d2bf2e8d..ad4c4def0 100644
--- a/server/tests/api/check-params/video-imports.ts
+++ b/server/tests/api/check-params/video-imports.ts
@@ -18,13 +18,13 @@ import {
18 setAccessTokensToServers, 18 setAccessTokensToServers,
19 updateCustomSubConfig, 19 updateCustomSubConfig,
20 userLogin 20 userLogin
21} from '../../../../shared/utils' 21} from '../../../../shared/extra-utils'
22import { 22import {
23 checkBadCountPagination, 23 checkBadCountPagination,
24 checkBadSortPagination, 24 checkBadSortPagination,
25 checkBadStartPagination 25 checkBadStartPagination
26} from '../../../../shared/utils/requests/check-api-params' 26} from '../../../../shared/extra-utils/requests/check-api-params'
27import { getMagnetURI, getYoutubeVideoUrl } from '../../../../shared/utils/videos/video-imports' 27import { getMagnetURI, getYoutubeVideoUrl } from '../../../../shared/extra-utils/videos/video-imports'
28 28
29describe('Test video imports API validator', function () { 29describe('Test video imports API validator', function () {
30 const path = '/api/v1/videos/imports' 30 const path = '/api/v1/videos/imports'
diff --git a/server/tests/api/check-params/video-playlists.ts b/server/tests/api/check-params/video-playlists.ts
index 229c23118..0f3484763 100644
--- a/server/tests/api/check-params/video-playlists.ts
+++ b/server/tests/api/check-params/video-playlists.ts
@@ -20,12 +20,12 @@ import {
20 updateVideoPlaylist, 20 updateVideoPlaylist,
21 updateVideoPlaylistElement, 21 updateVideoPlaylistElement,
22 uploadVideoAndGetId 22 uploadVideoAndGetId
23} from '../../../../shared/utils' 23} from '../../../../shared/extra-utils'
24import { 24import {
25 checkBadCountPagination, 25 checkBadCountPagination,
26 checkBadSortPagination, 26 checkBadSortPagination,
27 checkBadStartPagination 27 checkBadStartPagination
28} from '../../../../shared/utils/requests/check-api-params' 28} from '../../../../shared/extra-utils/requests/check-api-params'
29import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' 29import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
30import { VideoPlaylistType } from '../../../../shared/models/videos/playlist/video-playlist-type.model' 30import { VideoPlaylistType } from '../../../../shared/models/videos/playlist/video-playlist-type.model'
31 31
diff --git a/server/tests/api/check-params/videos-filter.ts b/server/tests/api/check-params/videos-filter.ts
index 7c487ae81..971867b27 100644
--- a/server/tests/api/check-params/videos-filter.ts
+++ b/server/tests/api/check-params/videos-filter.ts
@@ -11,7 +11,7 @@ import {
11 ServerInfo, 11 ServerInfo,
12 setAccessTokensToServers, setDefaultVideoChannel, 12 setAccessTokensToServers, setDefaultVideoChannel,
13 userLogin 13 userLogin
14} from '../../../../shared/utils' 14} from '../../../../shared/extra-utils'
15import { UserRole } from '../../../../shared/models/users' 15import { UserRole } from '../../../../shared/models/users'
16import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' 16import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
17 17
diff --git a/server/tests/api/check-params/videos-history.ts b/server/tests/api/check-params/videos-history.ts
index 8c079a956..11e277644 100644
--- a/server/tests/api/check-params/videos-history.ts
+++ b/server/tests/api/check-params/videos-history.ts
@@ -14,7 +14,7 @@ import {
14 ServerInfo, 14 ServerInfo,
15 setAccessTokensToServers, 15 setAccessTokensToServers,
16 uploadVideo 16 uploadVideo
17} from '../../../../shared/utils' 17} from '../../../../shared/extra-utils'
18 18
19const expect = chai.expect 19const expect = chai.expect
20 20
diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts
index 3f0e0d646..e96f324cc 100644
--- a/server/tests/api/check-params/videos.ts
+++ b/server/tests/api/check-params/videos.ts
@@ -9,13 +9,13 @@ import {
9 createUser, flushTests, getMyUserInformation, getVideo, getVideosList, immutableAssign, killallServers, makeDeleteRequest, 9 createUser, flushTests, getMyUserInformation, getVideo, getVideosList, immutableAssign, killallServers, makeDeleteRequest,
10 makeGetRequest, makeUploadRequest, makePutBodyRequest, removeVideo, uploadVideo, 10 makeGetRequest, makeUploadRequest, makePutBodyRequest, removeVideo, uploadVideo,
11 runServer, ServerInfo, setAccessTokensToServers, userLogin, updateCustomSubConfig 11 runServer, ServerInfo, setAccessTokensToServers, userLogin, updateCustomSubConfig
12} from '../../../../shared/utils' 12} from '../../../../shared/extra-utils'
13import { 13import {
14 checkBadCountPagination, 14 checkBadCountPagination,
15 checkBadSortPagination, 15 checkBadSortPagination,
16 checkBadStartPagination 16 checkBadStartPagination
17} from '../../../../shared/utils/requests/check-api-params' 17} from '../../../../shared/extra-utils/requests/check-api-params'
18import { getAccountsList } from '../../../../shared/utils/users/accounts' 18import { getAccountsList } from '../../../../shared/extra-utils/users/accounts'
19 19
20const expect = chai.expect 20const expect = chai.expect
21 21
diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts
index d1d6f3c35..8f7ce82a4 100644
--- a/server/tests/api/notifications/user-notifications.ts
+++ b/server/tests/api/notifications/user-notifications.ts
@@ -20,11 +20,11 @@ import {
20 wait, 20 wait,
21 getCustomConfig, 21 getCustomConfig,
22 updateCustomConfig, getVideoThreadComments, getVideoCommentThreads, follow 22 updateCustomConfig, getVideoThreadComments, getVideoCommentThreads, follow
23} from '../../../../shared/utils' 23} from '../../../../shared/extra-utils'
24import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/utils/index' 24import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index'
25import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 25import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
26import { waitJobs } from '../../../../shared/utils/server/jobs' 26import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
27import { getUserNotificationSocket } from '../../../../shared/utils/socket/socket-io' 27import { getUserNotificationSocket } from '../../../../shared/extra-utils/socket/socket-io'
28import { 28import {
29 checkCommentMention, 29 checkCommentMention,
30 CheckerBaseParams, 30 CheckerBaseParams,
@@ -42,7 +42,7 @@ import {
42 markAsReadNotifications, 42 markAsReadNotifications,
43 updateMyNotificationSettings, 43 updateMyNotificationSettings,
44 markAsReadAllNotifications, checkNewInstanceFollower 44 markAsReadAllNotifications, checkNewInstanceFollower
45} from '../../../../shared/utils/users/user-notifications' 45} from '../../../../shared/extra-utils/users/user-notifications'
46import { 46import {
47 User, 47 User,
48 UserNotification, 48 UserNotification,
@@ -50,13 +50,13 @@ import {
50 UserNotificationSettingValue, 50 UserNotificationSettingValue,
51 UserNotificationType 51 UserNotificationType
52} from '../../../../shared/models/users' 52} from '../../../../shared/models/users'
53import { MockSmtpServer } from '../../../../shared/utils/miscs/email' 53import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
54import { addUserSubscription, removeUserSubscription } from '../../../../shared/utils/users/user-subscriptions' 54import { addUserSubscription, removeUserSubscription } from '../../../../shared/extra-utils/users/user-subscriptions'
55import { VideoPrivacy } from '../../../../shared/models/videos' 55import { VideoPrivacy } from '../../../../shared/models/videos'
56import { getBadVideoUrl, getYoutubeVideoUrl, importVideo } from '../../../../shared/utils/videos/video-imports' 56import { getBadVideoUrl, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
57import { addVideoCommentReply, addVideoCommentThread } from '../../../../shared/utils/videos/video-comments' 57import { addVideoCommentReply, addVideoCommentThread } from '../../../../shared/extra-utils/videos/video-comments'
58import * as uuidv4 from 'uuid/v4' 58import * as uuidv4 from 'uuid/v4'
59import { addAccountToAccountBlocklist, removeAccountFromAccountBlocklist } from '../../../../shared/utils/users/blocklist' 59import { addAccountToAccountBlocklist, removeAccountFromAccountBlocklist } from '../../../../shared/extra-utils/users/blocklist'
60import { CustomConfig } from '../../../../shared/models/server' 60import { CustomConfig } from '../../../../shared/models/server'
61import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' 61import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
62 62
diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts
index 33921763d..280a4c64b 100644
--- a/server/tests/api/redundancy/redundancy.ts
+++ b/server/tests/api/redundancy/redundancy.ts
@@ -24,16 +24,16 @@ import {
24 viewVideo, 24 viewVideo,
25 wait, 25 wait,
26 waitUntilLog 26 waitUntilLog
27} from '../../../../shared/utils' 27} from '../../../../shared/extra-utils'
28import { waitJobs } from '../../../../shared/utils/server/jobs' 28import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
29 29
30import * as magnetUtil from 'magnet-uri' 30import * as magnetUtil from 'magnet-uri'
31import { updateRedundancy } from '../../../../shared/utils/server/redundancy' 31import { updateRedundancy } from '../../../../shared/extra-utils/server/redundancy'
32import { ActorFollow } from '../../../../shared/models/actors' 32import { ActorFollow } from '../../../../shared/models/actors'
33import { readdir } from 'fs-extra' 33import { readdir } from 'fs-extra'
34import { join } from 'path' 34import { join } from 'path'
35import { VideoRedundancyStrategy } from '../../../../shared/models/redundancy' 35import { VideoRedundancyStrategy } from '../../../../shared/models/redundancy'
36import { getStats } from '../../../../shared/utils/server/stats' 36import { getStats } from '../../../../shared/extra-utils/server/stats'
37import { ServerStats } from '../../../../shared/models/server/server-stats.model' 37import { ServerStats } from '../../../../shared/models/server/server-stats.model'
38 38
39const expect = chai.expect 39const expect = chai.expect
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts
index 682bd262a..1f59a951b 100644
--- a/server/tests/api/search/search-activitypub-video-channels.ts
+++ b/server/tests/api/search/search-activitypub-video-channels.ts
@@ -17,10 +17,10 @@ import {
17 uploadVideo, 17 uploadVideo,
18 userLogin, 18 userLogin,
19 wait 19 wait
20} from '../../../../shared/utils' 20} from '../../../../shared/extra-utils'
21import { waitJobs } from '../../../../shared/utils/server/jobs' 21import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
22import { VideoChannel } from '../../../../shared/models/videos' 22import { VideoChannel } from '../../../../shared/models/videos'
23import { searchVideoChannel } from '../../../../shared/utils/search/video-channels' 23import { searchVideoChannel } from '../../../../shared/extra-utils/search/video-channels'
24 24
25const expect = chai.expect 25const expect = chai.expect
26 26
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts
index f881917e7..d984c696c 100644
--- a/server/tests/api/search/search-activitypub-videos.ts
+++ b/server/tests/api/search/search-activitypub-videos.ts
@@ -16,8 +16,8 @@ import {
16 uploadVideo, 16 uploadVideo,
17 wait, 17 wait,
18 searchVideo 18 searchVideo
19} from '../../../../shared/utils' 19} from '../../../../shared/extra-utils'
20import { waitJobs } from '../../../../shared/utils/server/jobs' 20import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
21import { Video, VideoPrivacy } from '../../../../shared/models/videos' 21import { Video, VideoPrivacy } from '../../../../shared/models/videos'
22 22
23const expect = chai.expect 23const expect = chai.expect
diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts
index fa4078b99..65f3c9186 100644
--- a/server/tests/api/search/search-videos.ts
+++ b/server/tests/api/search/search-videos.ts
@@ -13,7 +13,7 @@ import {
13 uploadVideo, 13 uploadVideo,
14 wait, 14 wait,
15 immutableAssign 15 immutableAssign
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17 17
18const expect = chai.expect 18const expect = chai.expect
19 19
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 5373d02f2..a99916627 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -16,7 +16,7 @@ import {
16 runServer, 16 runServer,
17 setAccessTokensToServers, 17 setAccessTokensToServers,
18 updateCustomConfig 18 updateCustomConfig
19} from '../../../../shared/utils' 19} from '../../../../shared/extra-utils'
20import { ServerConfig } from '../../../../shared/models' 20import { ServerConfig } from '../../../../shared/models'
21 21
22const expect = chai.expect 22const expect = chai.expect
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index 06a2f89b0..fdd5e9730 100644
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -2,10 +2,10 @@
2 2
3import * as chai from 'chai' 3import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, wait } from '../../../../shared/utils' 5import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, wait } from '../../../../shared/extra-utils'
6import { MockSmtpServer } from '../../../../shared/utils/miscs/email' 6import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
7import { waitJobs } from '../../../../shared/utils/server/jobs' 7import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
8import { sendContactForm } from '../../../../shared/utils/server/contact-form' 8import { sendContactForm } from '../../../../shared/extra-utils/server/contact-form'
9 9
10const expect = chai.expect 10const expect = chai.expect
11 11
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index bc45102d2..a40a281f8 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -19,9 +19,9 @@ import {
19 killallServers, 19 killallServers,
20 ServerInfo, 20 ServerInfo,
21 setAccessTokensToServers 21 setAccessTokensToServers
22} from '../../../../shared/utils' 22} from '../../../../shared/extra-utils'
23import { MockSmtpServer } from '../../../../shared/utils/miscs/email' 23import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
24import { waitJobs } from '../../../../shared/utils/server/jobs' 24import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
25 25
26const expect = chai.expect 26const expect = chai.expect
27 27
diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts
index 28862a1c6..bdd8b1c70 100644
--- a/server/tests/api/server/follow-constraints.ts
+++ b/server/tests/api/server/follow-constraints.ts
@@ -13,10 +13,10 @@ import {
13 ServerInfo, 13 ServerInfo,
14 setAccessTokensToServers, 14 setAccessTokensToServers,
15 uploadVideo 15 uploadVideo
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17import { unfollow } from '../../../../shared/utils/server/follows' 17import { unfollow } from '../../../../shared/extra-utils/server/follows'
18import { userLogin } from '../../../../shared/utils/users/login' 18import { userLogin } from '../../../../shared/extra-utils/users/login'
19import { createUser } from '../../../../shared/utils/users/users' 19import { createUser } from '../../../../shared/extra-utils/users/users'
20 20
21const expect = chai.expect 21const expect = chai.expect
22 22
diff --git a/server/tests/api/server/follows-moderation.ts b/server/tests/api/server/follows-moderation.ts
index 0bb3aa866..f4a826ea8 100644
--- a/server/tests/api/server/follows-moderation.ts
+++ b/server/tests/api/server/follows-moderation.ts
@@ -9,15 +9,15 @@ import {
9 ServerInfo, 9 ServerInfo,
10 setAccessTokensToServers, 10 setAccessTokensToServers,
11 updateCustomSubConfig 11 updateCustomSubConfig
12} from '../../../../shared/utils/index' 12} from '../../../../shared/extra-utils/index'
13import { 13import {
14 follow, 14 follow,
15 getFollowersListPaginationAndSort, 15 getFollowersListPaginationAndSort,
16 getFollowingListPaginationAndSort, 16 getFollowingListPaginationAndSort,
17 removeFollower, 17 removeFollower,
18 rejectFollower 18 rejectFollower
19} from '../../../../shared/utils/server/follows' 19} from '../../../../shared/extra-utils/server/follows'
20import { waitJobs } from '../../../../shared/utils/server/jobs' 20import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
21import { ActorFollow } from '../../../../shared/models/actors' 21import { ActorFollow } from '../../../../shared/models/actors'
22 22
23const expect = chai.expect 23const expect = chai.expect
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index a5e6c3c1e..527b54e1e 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -4,7 +4,7 @@ import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { Video, VideoPrivacy } from '../../../../shared/models/videos' 5import { Video, VideoPrivacy } from '../../../../shared/models/videos'
6import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' 6import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
7import { completeVideoCheck } from '../../../../shared/utils' 7import { completeVideoCheck } from '../../../../shared/extra-utils'
8import { 8import {
9 flushAndRunMultipleServers, 9 flushAndRunMultipleServers,
10 getVideosList, 10 getVideosList,
@@ -12,26 +12,26 @@ import {
12 ServerInfo, 12 ServerInfo,
13 setAccessTokensToServers, 13 setAccessTokensToServers,
14 uploadVideo 14 uploadVideo
15} from '../../../../shared/utils/index' 15} from '../../../../shared/extra-utils/index'
16import { dateIsValid } from '../../../../shared/utils/miscs/miscs' 16import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs'
17import { 17import {
18 follow, 18 follow,
19 getFollowersListPaginationAndSort, 19 getFollowersListPaginationAndSort,
20 getFollowingListPaginationAndSort, 20 getFollowingListPaginationAndSort,
21 unfollow 21 unfollow
22} from '../../../../shared/utils/server/follows' 22} from '../../../../shared/extra-utils/server/follows'
23import { expectAccountFollows } from '../../../../shared/utils/users/accounts' 23import { expectAccountFollows } from '../../../../shared/extra-utils/users/accounts'
24import { userLogin } from '../../../../shared/utils/users/login' 24import { userLogin } from '../../../../shared/extra-utils/users/login'
25import { createUser } from '../../../../shared/utils/users/users' 25import { createUser } from '../../../../shared/extra-utils/users/users'
26import { 26import {
27 addVideoCommentReply, 27 addVideoCommentReply,
28 addVideoCommentThread, 28 addVideoCommentThread,
29 getVideoCommentThreads, 29 getVideoCommentThreads,
30 getVideoThreadComments 30 getVideoThreadComments
31} from '../../../../shared/utils/videos/video-comments' 31} from '../../../../shared/extra-utils/videos/video-comments'
32import { rateVideo } from '../../../../shared/utils/videos/videos' 32import { rateVideo } from '../../../../shared/extra-utils/videos/videos'
33import { waitJobs } from '../../../../shared/utils/server/jobs' 33import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
34import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/utils/videos/video-captions' 34import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/extra-utils/videos/video-captions'
35import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' 35import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
36 36
37const expect = chai.expect 37const expect = chai.expect
diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts
index cd5acbe16..8c49541ee 100644
--- a/server/tests/api/server/handle-down.ts
+++ b/server/tests/api/server/handle-down.ts
@@ -20,15 +20,15 @@ import {
20 updateVideo, 20 updateVideo,
21 uploadVideo, 21 uploadVideo,
22 wait 22 wait
23} from '../../../../shared/utils' 23} from '../../../../shared/extra-utils'
24import { follow, getFollowersListPaginationAndSort } from '../../../../shared/utils/server/follows' 24import { follow, getFollowersListPaginationAndSort } from '../../../../shared/extra-utils/server/follows'
25import { getJobsListPaginationAndSort, waitJobs } from '../../../../shared/utils/server/jobs' 25import { getJobsListPaginationAndSort, waitJobs } from '../../../../shared/extra-utils/server/jobs'
26import { 26import {
27 addVideoCommentReply, 27 addVideoCommentReply,
28 addVideoCommentThread, 28 addVideoCommentThread,
29 getVideoCommentThreads, 29 getVideoCommentThreads,
30 getVideoThreadComments 30 getVideoThreadComments
31} from '../../../../shared/utils/videos/video-comments' 31} from '../../../../shared/extra-utils/videos/video-comments'
32 32
33const expect = chai.expect 33const expect = chai.expect
34 34
diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index 52948b1d6..1d7429873 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -2,12 +2,12 @@
2 2
3import * as chai from 'chai' 3import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index' 5import { killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
6import { doubleFollow } from '../../../../shared/utils/server/follows' 6import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
7import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../../../shared/utils/server/jobs' 7import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../../../shared/extra-utils/server/jobs'
8import { flushAndRunMultipleServers } from '../../../../shared/utils/server/servers' 8import { flushAndRunMultipleServers } from '../../../../shared/extra-utils/server/servers'
9import { uploadVideo } from '../../../../shared/utils/videos/videos' 9import { uploadVideo } from '../../../../shared/extra-utils/videos/videos'
10import { dateIsValid } from '../../../../shared/utils/miscs/miscs' 10import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs'
11 11
12const expect = chai.expect 12const expect = chai.expect
13 13
diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts
index 05b0308de..f55e12407 100644
--- a/server/tests/api/server/logs.ts
+++ b/server/tests/api/server/logs.ts
@@ -2,10 +2,10 @@
2 2
3import * as chai from 'chai' 3import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index' 5import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
6import { waitJobs } from '../../../../shared/utils/server/jobs' 6import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
7import { uploadVideo } from '../../../../shared/utils/videos/videos' 7import { uploadVideo } from '../../../../shared/extra-utils/videos/videos'
8import { getLogs } from '../../../../shared/utils/logs/logs' 8import { getLogs } from '../../../../shared/extra-utils/logs/logs'
9 9
10const expect = chai.expect 10const expect = chai.expect
11 11
diff --git a/server/tests/api/server/no-client.ts b/server/tests/api/server/no-client.ts
index 3b95ce945..88d34063c 100644
--- a/server/tests/api/server/no-client.ts
+++ b/server/tests/api/server/no-client.ts
@@ -4,8 +4,8 @@ import {
4 flushTests, 4 flushTests,
5 killallServers, 5 killallServers,
6 ServerInfo 6 ServerInfo
7} from '../../../../shared/utils' 7} from '../../../../shared/extra-utils'
8import { runServer } from '../../../../shared/utils/server/servers' 8import { runServer } from '../../../../shared/extra-utils/server/servers'
9 9
10describe('Start and stop server without web client routes', function () { 10describe('Start and stop server without web client routes', function () {
11 let server: ServerInfo 11 let server: ServerInfo
diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts
index ee0fffd5a..e7dc16531 100644
--- a/server/tests/api/server/reverse-proxy.ts
+++ b/server/tests/api/server/reverse-proxy.ts
@@ -15,7 +15,7 @@ import {
15 userLogin, 15 userLogin,
16 viewVideo, 16 viewVideo,
17 wait 17 wait
18} from '../../../../shared/utils' 18} from '../../../../shared/extra-utils'
19const expect = chai.expect 19const expect = chai.expect
20 20
21import { 21import {
@@ -23,7 +23,7 @@ import {
23 flushTests, 23 flushTests,
24 runServer, 24 runServer,
25 registerUser, getCustomConfig, setAccessTokensToServers, updateCustomConfig 25 registerUser, getCustomConfig, setAccessTokensToServers, updateCustomConfig
26} from '../../../../shared/utils/index' 26} from '../../../../shared/extra-utils/index'
27 27
28describe('Test application behind a reverse proxy', function () { 28describe('Test application behind a reverse proxy', function () {
29 let server = null 29 let server = null
diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts
index eadbcaf83..48addad22 100644
--- a/server/tests/api/server/stats.ts
+++ b/server/tests/api/server/stats.ts
@@ -13,11 +13,11 @@ import {
13 uploadVideo, 13 uploadVideo,
14 viewVideo, 14 viewVideo,
15 wait 15 wait
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17import { flushTests, setAccessTokensToServers } from '../../../../shared/utils/index' 17import { flushTests, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
18import { getStats } from '../../../../shared/utils/server/stats' 18import { getStats } from '../../../../shared/extra-utils/server/stats'
19import { addVideoCommentThread } from '../../../../shared/utils/videos/video-comments' 19import { addVideoCommentThread } from '../../../../shared/extra-utils/videos/video-comments'
20import { waitJobs } from '../../../../shared/utils/server/jobs' 20import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
21 21
22const expect = chai.expect 22const expect = chai.expect
23 23
diff --git a/server/tests/api/server/tracker.ts b/server/tests/api/server/tracker.ts
index 41803aef1..4f7cc05a7 100644
--- a/server/tests/api/server/tracker.ts
+++ b/server/tests/api/server/tracker.ts
@@ -2,8 +2,8 @@
2 2
3import * as magnetUtil from 'magnet-uri' 3import * as magnetUtil from 'magnet-uri'
4import 'mocha' 4import 'mocha'
5import { getVideo, killallServers, reRunServer, runServer, ServerInfo, uploadVideo } from '../../../../shared/utils' 5import { getVideo, killallServers, reRunServer, runServer, ServerInfo, uploadVideo } from '../../../../shared/extra-utils'
6import { flushTests, setAccessTokensToServers } from '../../../../shared/utils/index' 6import { flushTests, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
7import { VideoDetails } from '../../../../shared/models/videos' 7import { VideoDetails } from '../../../../shared/models/videos'
8import * as WebTorrent from 'webtorrent' 8import * as WebTorrent from 'webtorrent'
9 9
diff --git a/server/tests/api/users/blocklist.ts b/server/tests/api/users/blocklist.ts
index 638a443ba..cd96ffe2a 100644
--- a/server/tests/api/users/blocklist.ts
+++ b/server/tests/api/users/blocklist.ts
@@ -12,16 +12,16 @@ import {
12 ServerInfo, 12 ServerInfo,
13 uploadVideo, 13 uploadVideo,
14 userLogin 14 userLogin
15} from '../../../../shared/utils/index' 15} from '../../../../shared/extra-utils/index'
16import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 16import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
17import { getVideosListWithToken, getVideosList } from '../../../../shared/utils/videos/videos' 17import { getVideosListWithToken, getVideosList } from '../../../../shared/extra-utils/videos/videos'
18import { 18import {
19 addVideoCommentReply, 19 addVideoCommentReply,
20 addVideoCommentThread, 20 addVideoCommentThread,
21 getVideoCommentThreads, 21 getVideoCommentThreads,
22 getVideoThreadComments 22 getVideoThreadComments
23} from '../../../../shared/utils/videos/video-comments' 23} from '../../../../shared/extra-utils/videos/video-comments'
24import { waitJobs } from '../../../../shared/utils/server/jobs' 24import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
25import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' 25import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
26import { 26import {
27 addAccountToAccountBlocklist, 27 addAccountToAccountBlocklist,
@@ -36,7 +36,7 @@ import {
36 removeAccountFromServerBlocklist, 36 removeAccountFromServerBlocklist,
37 removeServerFromAccountBlocklist, 37 removeServerFromAccountBlocklist,
38 removeServerFromServerBlocklist 38 removeServerFromServerBlocklist
39} from '../../../../shared/utils/users/blocklist' 39} from '../../../../shared/extra-utils/users/blocklist'
40 40
41const expect = chai.expect 41const expect = chai.expect
42 42
diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index 037a79a76..5be185678 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -11,18 +11,18 @@ import {
11 unfollow, 11 unfollow,
12 updateVideo, 12 updateVideo,
13 userLogin 13 userLogin
14} from '../../../../shared/utils' 14} from '../../../../shared/extra-utils'
15import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/utils/index' 15import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index'
16import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 16import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
17import { Video, VideoChannel } from '../../../../shared/models/videos' 17import { Video, VideoChannel } from '../../../../shared/models/videos'
18import { waitJobs } from '../../../../shared/utils/server/jobs' 18import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
19import { 19import {
20 addUserSubscription, 20 addUserSubscription,
21 listUserSubscriptions, 21 listUserSubscriptions,
22 listUserSubscriptionVideos, 22 listUserSubscriptionVideos,
23 removeUserSubscription, 23 removeUserSubscription,
24 getUserSubscription, areSubscriptionsExist 24 getUserSubscription, areSubscriptionsExist
25} from '../../../../shared/utils/users/user-subscriptions' 25} from '../../../../shared/extra-utils/users/user-subscriptions'
26 26
27const expect = chai.expect 27const expect = chai.expect
28 28
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 0510b2de9..9b8db0072 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -14,13 +14,20 @@ import {
14 removeUser, 14 removeUser,
15 updateMyUser, 15 updateMyUser,
16 userLogin 16 userLogin
17} from '../../../../shared/utils' 17} from '../../../../shared/extra-utils'
18import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/utils/index' 18import {
19import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/utils/users/accounts' 19 getMyUserInformation,
20import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 20 killallServers,
21 ServerInfo,
22 testImage,
23 updateMyAvatar,
24 uploadVideo
25} from '../../../../shared/extra-utils/index'
26import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/extra-utils/users/accounts'
27import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
21import { User } from '../../../../shared/models/users' 28import { User } from '../../../../shared/models/users'
22import { VideoChannel } from '../../../../shared/models/videos' 29import { VideoChannel } from '../../../../shared/models/videos'
23import { waitJobs } from '../../../../shared/utils/server/jobs' 30import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
24 31
25const expect = chai.expect 32const expect = chai.expect
26 33
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index babeda2b8..7fcd3e50b 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -5,10 +5,10 @@ import 'mocha'
5import { 5import {
6 registerUser, flushTests, getUserInformation, getMyUserInformation, killallServers, 6 registerUser, flushTests, getUserInformation, getMyUserInformation, killallServers,
7 userLogin, login, runServer, ServerInfo, verifyEmail, updateCustomSubConfig, wait 7 userLogin, login, runServer, ServerInfo, verifyEmail, updateCustomSubConfig, wait
8} from '../../../../shared/utils' 8} from '../../../../shared/extra-utils'
9import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 9import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
10import { MockSmtpServer } from '../../../../shared/utils/miscs/email' 10import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
11import { waitJobs } from '../../../../shared/utils/server/jobs' 11import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
12 12
13const expect = chai.expect 13const expect = chai.expect
14 14
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 13511e070..472ff511c 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -33,10 +33,10 @@ import {
33 updateUser, 33 updateUser,
34 uploadVideo, 34 uploadVideo,
35 userLogin 35 userLogin
36} from '../../../../shared/utils' 36} from '../../../../shared/extra-utils'
37import { follow } from '../../../../shared/utils/server/follows' 37import { follow } from '../../../../shared/extra-utils/server/follows'
38import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 38import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
39import { getMyVideos } from '../../../../shared/utils/videos/videos' 39import { getMyVideos } from '../../../../shared/extra-utils/videos/videos'
40import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' 40import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
41 41
42const expect = chai.expect 42const expect = chai.expect
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 46486b777..dd50f905d 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -32,15 +32,15 @@ import {
32 viewVideo, 32 viewVideo,
33 wait, 33 wait,
34 webtorrentAdd 34 webtorrentAdd
35} from '../../../../shared/utils' 35} from '../../../../shared/extra-utils'
36import { 36import {
37 addVideoCommentReply, 37 addVideoCommentReply,
38 addVideoCommentThread, 38 addVideoCommentThread,
39 deleteVideoComment, 39 deleteVideoComment,
40 getVideoCommentThreads, 40 getVideoCommentThreads,
41 getVideoThreadComments 41 getVideoThreadComments
42} from '../../../../shared/utils/videos/video-comments' 42} from '../../../../shared/extra-utils/videos/video-comments'
43import { waitJobs } from '../../../../shared/utils/server/jobs' 43import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
44 44
45const expect = chai.expect 45const expect = chai.expect
46 46
diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts
index 2da86964f..e79ce59a6 100644
--- a/server/tests/api/videos/services.ts
+++ b/server/tests/api/videos/services.ts
@@ -10,8 +10,8 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 uploadVideo 12 uploadVideo
13} from '../../../../shared/utils/index' 13} from '../../../../shared/extra-utils/index'
14import { runServer } from '../../../../shared/utils/server/servers' 14import { runServer } from '../../../../shared/extra-utils/server/servers'
15 15
16const expect = chai.expect 16const expect = chai.expect
17 17
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index cfdcbaf3f..ea3e7c421 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -28,7 +28,7 @@ import {
28 uploadVideo, 28 uploadVideo,
29 viewVideo, 29 viewVideo,
30 wait 30 wait
31} from '../../../../shared/utils' 31} from '../../../../shared/extra-utils'
32 32
33const expect = chai.expect 33const expect = chai.expect
34 34
diff --git a/server/tests/api/videos/video-abuse.ts b/server/tests/api/videos/video-abuse.ts
index 3a7b623da..2ae1bf34d 100644
--- a/server/tests/api/videos/video-abuse.ts
+++ b/server/tests/api/videos/video-abuse.ts
@@ -14,9 +14,9 @@ import {
14 setAccessTokensToServers, 14 setAccessTokensToServers,
15 updateVideoAbuse, 15 updateVideoAbuse,
16 uploadVideo 16 uploadVideo
17} from '../../../../shared/utils/index' 17} from '../../../../shared/extra-utils/index'
18import { doubleFollow } from '../../../../shared/utils/server/follows' 18import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
19import { waitJobs } from '../../../../shared/utils/server/jobs' 19import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
20 20
21const expect = chai.expect 21const expect = chai.expect
22 22
diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts
index 1feae19e9..582c82e05 100644
--- a/server/tests/api/videos/video-blacklist.ts
+++ b/server/tests/api/videos/video-blacklist.ts
@@ -20,9 +20,9 @@ import {
20 updateVideoBlacklist, 20 updateVideoBlacklist,
21 uploadVideo, 21 uploadVideo,
22 userLogin 22 userLogin
23} from '../../../../shared/utils/index' 23} from '../../../../shared/extra-utils/index'
24import { doubleFollow } from '../../../../shared/utils/server/follows' 24import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
25import { waitJobs } from '../../../../shared/utils/server/jobs' 25import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
26import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos' 26import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos'
27import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' 27import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
28import { UserRole } from '../../../../shared/models/users' 28import { UserRole } from '../../../../shared/models/users'
diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts
index 57bee713f..da920e00c 100644
--- a/server/tests/api/videos/video-captions.ts
+++ b/server/tests/api/videos/video-captions.ts
@@ -9,10 +9,15 @@ import {
9 removeVideo, 9 removeVideo,
10 uploadVideo, 10 uploadVideo,
11 wait 11 wait
12} from '../../../../shared/utils' 12} from '../../../../shared/extra-utils'
13import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index' 13import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
14import { waitJobs } from '../../../../shared/utils/server/jobs' 14import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
15import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/utils/videos/video-captions' 15import {
16 createVideoCaption,
17 deleteVideoCaption,
18 listVideoCaptions,
19 testCaptionFile
20} from '../../../../shared/extra-utils/videos/video-captions'
16import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' 21import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
17 22
18const expect = chai.expect 23const expect = chai.expect
diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts
index a23e30dc0..9040ac308 100644
--- a/server/tests/api/videos/video-change-ownership.ts
+++ b/server/tests/api/videos/video-change-ownership.ts
@@ -18,8 +18,8 @@ import {
18 uploadVideo, 18 uploadVideo,
19 userLogin, 19 userLogin,
20 getVideo 20 getVideo
21} from '../../../../shared/utils' 21} from '../../../../shared/extra-utils'
22import { waitJobs } from '../../../../shared/utils/server/jobs' 22import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
23import { User } from '../../../../shared/models/users' 23import { User } from '../../../../shared/models/users'
24import { VideoDetails } from '../../../../shared/models/videos' 24import { VideoDetails } from '../../../../shared/models/videos'
25 25
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index bd672cf41..e30e6bb4f 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -13,7 +13,7 @@ import {
13 updateVideoChannelAvatar, 13 updateVideoChannelAvatar,
14 uploadVideo, 14 uploadVideo,
15 userLogin 15 userLogin
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17import { 17import {
18 addVideoChannel, 18 addVideoChannel,
19 deleteVideoChannel, 19 deleteVideoChannel,
@@ -26,8 +26,8 @@ import {
26 ServerInfo, 26 ServerInfo,
27 setAccessTokensToServers, 27 setAccessTokensToServers,
28 updateVideoChannel 28 updateVideoChannel
29} from '../../../../shared/utils/index' 29} from '../../../../shared/extra-utils/index'
30import { waitJobs } from '../../../../shared/utils/server/jobs' 30import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
31 31
32const expect = chai.expect 32const expect = chai.expect
33 33
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index ce1b17e35..abf4d0c44 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -3,7 +3,7 @@
3import * as chai from 'chai' 3import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' 5import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
6import { testImage } from '../../../../shared/utils' 6import { testImage } from '../../../../shared/extra-utils'
7import { 7import {
8 dateIsValid, 8 dateIsValid,
9 flushTests, 9 flushTests,
@@ -13,14 +13,14 @@ import {
13 setAccessTokensToServers, 13 setAccessTokensToServers,
14 updateMyAvatar, 14 updateMyAvatar,
15 uploadVideo 15 uploadVideo
16} from '../../../../shared/utils/index' 16} from '../../../../shared/extra-utils/index'
17import { 17import {
18 addVideoCommentReply, 18 addVideoCommentReply,
19 addVideoCommentThread, 19 addVideoCommentThread,
20 deleteVideoComment, 20 deleteVideoComment,
21 getVideoCommentThreads, 21 getVideoCommentThreads,
22 getVideoThreadComments 22 getVideoThreadComments
23} from '../../../../shared/utils/videos/video-comments' 23} from '../../../../shared/extra-utils/videos/video-comments'
24 24
25const expect = chai.expect 25const expect = chai.expect
26 26
diff --git a/server/tests/api/videos/video-description.ts b/server/tests/api/videos/video-description.ts
index cbda0b9a6..0c03d17d8 100644
--- a/server/tests/api/videos/video-description.ts
+++ b/server/tests/api/videos/video-description.ts
@@ -12,9 +12,9 @@ import {
12 setAccessTokensToServers, 12 setAccessTokensToServers,
13 updateVideo, 13 updateVideo,
14 uploadVideo 14 uploadVideo
15} from '../../../../shared/utils/index' 15} from '../../../../shared/extra-utils/index'
16import { doubleFollow } from '../../../../shared/utils/server/follows' 16import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
17import { waitJobs } from '../../../../shared/utils/server/jobs' 17import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
18 18
19const expect = chai.expect 19const expect = chai.expect
20 20
diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/videos/video-hls.ts
index 3d04758b1..a9251406a 100644
--- a/server/tests/api/videos/video-hls.ts
+++ b/server/tests/api/videos/video-hls.ts
@@ -18,7 +18,7 @@ import {
18 updateVideo, 18 updateVideo,
19 uploadVideo, 19 uploadVideo,
20 waitJobs 20 waitJobs
21} from '../../../../shared/utils' 21} from '../../../../shared/extra-utils'
22import { VideoDetails } from '../../../../shared/models/videos' 22import { VideoDetails } from '../../../../shared/models/videos'
23import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type' 23import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type'
24import { join } from 'path' 24import { join } from 'path'
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index c5ffb793b..f8b2c0407 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -14,9 +14,9 @@ import {
14 killallServers, 14 killallServers,
15 ServerInfo, 15 ServerInfo,
16 setAccessTokensToServers 16 setAccessTokensToServers
17} from '../../../../shared/utils' 17} from '../../../../shared/extra-utils'
18import { waitJobs } from '../../../../shared/utils/server/jobs' 18import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
19import { getMagnetURI, getYoutubeVideoUrl, importVideo, getMyVideoImports } from '../../../../shared/utils/videos/video-imports' 19import { getMagnetURI, getYoutubeVideoUrl, importVideo, getMyVideoImports } from '../../../../shared/extra-utils/videos/video-imports'
20 20
21const expect = chai.expect 21const expect = chai.expect
22 22
diff --git a/server/tests/api/videos/video-nsfw.ts b/server/tests/api/videos/video-nsfw.ts
index cb972d921..9f2d99ffe 100644
--- a/server/tests/api/videos/video-nsfw.ts
+++ b/server/tests/api/videos/video-nsfw.ts
@@ -9,10 +9,10 @@ import {
9 ServerInfo, 9 ServerInfo,
10 setAccessTokensToServers, 10 setAccessTokensToServers,
11 uploadVideo 11 uploadVideo
12} from '../../../../shared/utils/index' 12} from '../../../../shared/extra-utils/index'
13import { userLogin } from '../../../../shared/utils/users/login' 13import { userLogin } from '../../../../shared/extra-utils/users/login'
14import { createUser } from '../../../../shared/utils/users/users' 14import { createUser } from '../../../../shared/extra-utils/users/users'
15import { getMyVideos } from '../../../../shared/utils/videos/videos' 15import { getMyVideos } from '../../../../shared/extra-utils/videos/videos'
16import { 16import {
17 getAccountVideos, 17 getAccountVideos,
18 getConfig, 18 getConfig,
@@ -25,7 +25,7 @@ import {
25 searchVideoWithToken, 25 searchVideoWithToken,
26 updateCustomConfig, 26 updateCustomConfig,
27 updateMyUser 27 updateMyUser
28} from '../../../../shared/utils' 28} from '../../../../shared/extra-utils'
29import { ServerConfig } from '../../../../shared/models' 29import { ServerConfig } from '../../../../shared/models'
30import { CustomConfig } from '../../../../shared/models/server/custom-config.model' 30import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
31import { User } from '../../../../shared/models/users' 31import { User } from '../../../../shared/models/users'
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index d9cb71992..8c3542906 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -36,7 +36,7 @@ import {
36 uploadVideoAndGetId, 36 uploadVideoAndGetId,
37 userLogin, 37 userLogin,
38 waitJobs 38 waitJobs
39} from '../../../../shared/utils' 39} from '../../../../shared/extra-utils'
40import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' 40import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
41import { VideoPlaylist } from '../../../../shared/models/videos/playlist/video-playlist.model' 41import { VideoPlaylist } from '../../../../shared/models/videos/playlist/video-playlist.model'
42import { Video } from '../../../../shared/models/videos' 42import { Video } from '../../../../shared/models/videos'
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts
index e1b5fb193..ba5e0f044 100644
--- a/server/tests/api/videos/video-privacy.ts
+++ b/server/tests/api/videos/video-privacy.ts
@@ -10,12 +10,12 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 uploadVideo 12 uploadVideo
13} from '../../../../shared/utils/index' 13} from '../../../../shared/extra-utils/index'
14import { doubleFollow } from '../../../../shared/utils/server/follows' 14import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
15import { userLogin } from '../../../../shared/utils/users/login' 15import { userLogin } from '../../../../shared/extra-utils/users/login'
16import { createUser } from '../../../../shared/utils/users/users' 16import { createUser } from '../../../../shared/extra-utils/users/users'
17import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../../../shared/utils/videos/videos' 17import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../../../shared/extra-utils/videos/videos'
18import { waitJobs } from '../../../../shared/utils/server/jobs' 18import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
19 19
20const expect = chai.expect 20const expect = chai.expect
21 21
diff --git a/server/tests/api/videos/video-schedule-update.ts b/server/tests/api/videos/video-schedule-update.ts
index 632c4244c..b19a9116a 100644
--- a/server/tests/api/videos/video-schedule-update.ts
+++ b/server/tests/api/videos/video-schedule-update.ts
@@ -15,8 +15,8 @@ import {
15 updateVideo, 15 updateVideo,
16 uploadVideo, 16 uploadVideo,
17 wait 17 wait
18} from '../../../../shared/utils' 18} from '../../../../shared/extra-utils'
19import { waitJobs } from '../../../../shared/utils/server/jobs' 19import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
20 20
21const expect = chai.expect 21const expect = chai.expect
22 22
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index eefd32ef8..3d4739ca9 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -19,9 +19,9 @@ import {
19 setAccessTokensToServers, 19 setAccessTokensToServers,
20 uploadVideo, 20 uploadVideo,
21 webtorrentAdd 21 webtorrentAdd
22} from '../../../../shared/utils' 22} from '../../../../shared/extra-utils'
23import { extname, join } from 'path' 23import { extname, join } from 'path'
24import { waitJobs } from '../../../../shared/utils/server/jobs' 24import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
25import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants' 25import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants'
26 26
27const expect = chai.expect 27const expect = chai.expect
diff --git a/server/tests/api/videos/videos-filter.ts b/server/tests/api/videos/videos-filter.ts
index 920ca0023..36664b17f 100644
--- a/server/tests/api/videos/videos-filter.ts
+++ b/server/tests/api/videos/videos-filter.ts
@@ -13,7 +13,7 @@ import {
13 setAccessTokensToServers, 13 setAccessTokensToServers,
14 uploadVideo, 14 uploadVideo,
15 userLogin 15 userLogin
16} from '../../../../shared/utils' 16} from '../../../../shared/extra-utils'
17import { Video, VideoPrivacy } from '../../../../shared/models/videos' 17import { Video, VideoPrivacy } from '../../../../shared/models/videos'
18import { UserRole } from '../../../../shared/models/users' 18import { UserRole } from '../../../../shared/models/users'
19 19
diff --git a/server/tests/api/videos/videos-history.ts b/server/tests/api/videos/videos-history.ts
index ab40bb64c..6f75ce42c 100644
--- a/server/tests/api/videos/videos-history.ts
+++ b/server/tests/api/videos/videos-history.ts
@@ -16,9 +16,9 @@ import {
16 uploadVideo, 16 uploadVideo,
17 userLogin, 17 userLogin,
18 wait 18 wait
19} from '../../../../shared/utils' 19} from '../../../../shared/extra-utils'
20import { Video, VideoDetails } from '../../../../shared/models/videos' 20import { Video, VideoDetails } from '../../../../shared/models/videos'
21import { listMyVideosHistory, removeMyVideosHistory, userWatchVideo } from '../../../../shared/utils/videos/video-history' 21import { listMyVideosHistory, removeMyVideosHistory, userWatchVideo } from '../../../../shared/extra-utils/videos/video-history'
22 22
23const expect = chai.expect 23const expect = chai.expect
24 24
diff --git a/server/tests/api/videos/videos-overview.ts b/server/tests/api/videos/videos-overview.ts
index 7221bcae6..233ca8a5d 100644
--- a/server/tests/api/videos/videos-overview.ts
+++ b/server/tests/api/videos/videos-overview.ts
@@ -2,8 +2,8 @@
2 2
3import * as chai from 'chai' 3import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../../../shared/utils' 5import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../../../shared/extra-utils'
6import { getVideosOverview } from '../../../../shared/utils/overviews/overviews' 6import { getVideosOverview } from '../../../../shared/extra-utils/overviews/overviews'
7import { VideosOverview } from '../../../../shared/models/overviews' 7import { VideosOverview } from '../../../../shared/models/overviews'
8 8
9const expect = chai.expect 9const expect = chai.expect
diff --git a/server/tests/api/videos/videos-views-cleaner.ts b/server/tests/api/videos/videos-views-cleaner.ts
index 9f268c8e6..4001969c3 100644
--- a/server/tests/api/videos/videos-views-cleaner.ts
+++ b/server/tests/api/videos/videos-views-cleaner.ts
@@ -11,10 +11,10 @@ import {
11 ServerInfo, 11 ServerInfo,
12 setAccessTokensToServers, 12 setAccessTokensToServers,
13 uploadVideo, uploadVideoAndGetId, viewVideo, wait, countVideoViewsOf, doubleFollow, waitJobs 13 uploadVideo, uploadVideoAndGetId, viewVideo, wait, countVideoViewsOf, doubleFollow, waitJobs
14} from '../../../../shared/utils' 14} from '../../../../shared/extra-utils'
15import { getVideosOverview } from '../../../../shared/utils/overviews/overviews' 15import { getVideosOverview } from '../../../../shared/extra-utils/overviews/overviews'
16import { VideosOverview } from '../../../../shared/models/overviews' 16import { VideosOverview } from '../../../../shared/models/overviews'
17import { listMyVideosHistory } from '../../../../shared/utils/videos/video-history' 17import { listMyVideosHistory } from '../../../../shared/extra-utils/videos/video-history'
18 18
19const expect = chai.expect 19const expect = chai.expect
20 20
diff --git a/server/tests/cli/create-import-video-file-job.ts b/server/tests/cli/create-import-video-file-job.ts
index 4acda47b1..4dc12a1c6 100644
--- a/server/tests/cli/create-import-video-file-job.ts
+++ b/server/tests/cli/create-import-video-file-job.ts
@@ -15,8 +15,8 @@ import {
15 ServerInfo, 15 ServerInfo,
16 setAccessTokensToServers, 16 setAccessTokensToServers,
17 uploadVideo 17 uploadVideo
18} from '../../../shared/utils' 18} from '../../../shared/extra-utils'
19import { waitJobs } from '../../../shared/utils/server/jobs' 19import { waitJobs } from '../../../shared/extra-utils/server/jobs'
20 20
21const expect = chai.expect 21const expect = chai.expect
22 22
diff --git a/server/tests/cli/create-transcoding-job.ts b/server/tests/cli/create-transcoding-job.ts
index 50be5fa19..bd1de2079 100644
--- a/server/tests/cli/create-transcoding-job.ts
+++ b/server/tests/cli/create-transcoding-job.ts
@@ -15,8 +15,8 @@ import {
15 ServerInfo, 15 ServerInfo,
16 setAccessTokensToServers, 16 setAccessTokensToServers,
17 uploadVideo, wait 17 uploadVideo, wait
18} from '../../../shared/utils' 18} from '../../../shared/extra-utils'
19import { waitJobs } from '../../../shared/utils/server/jobs' 19import { waitJobs } from '../../../shared/extra-utils/server/jobs'
20 20
21const expect = chai.expect 21const expect = chai.expect
22 22
diff --git a/server/tests/cli/optimize-old-videos.ts b/server/tests/cli/optimize-old-videos.ts
index f84ba1ece..b3724476b 100644
--- a/server/tests/cli/optimize-old-videos.ts
+++ b/server/tests/cli/optimize-old-videos.ts
@@ -15,8 +15,8 @@ import {
15 ServerInfo, 15 ServerInfo,
16 setAccessTokensToServers, 16 setAccessTokensToServers,
17 uploadVideo, viewVideo, wait 17 uploadVideo, viewVideo, wait
18} from '../../../shared/utils' 18} from '../../../shared/extra-utils'
19import { waitJobs } from '../../../shared/utils/server/jobs' 19import { waitJobs } from '../../../shared/extra-utils/server/jobs'
20import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../helpers/ffmpeg-utils' 20import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../helpers/ffmpeg-utils'
21import { VIDEO_TRANSCODING_FPS } from '../../initializers/constants' 21import { VIDEO_TRANSCODING_FPS } from '../../initializers/constants'
22import { join } from 'path' 22import { join } from 'path'
diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index b0ae876d3..45411bdbc 100644
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -11,7 +11,7 @@ import {
11 runServer, 11 runServer,
12 ServerInfo, 12 ServerInfo,
13 setAccessTokensToServers 13 setAccessTokensToServers
14} from '../../../shared/utils' 14} from '../../../shared/extra-utils'
15 15
16describe('Test CLI wrapper', function () { 16describe('Test CLI wrapper', function () {
17 let server: ServerInfo 17 let server: ServerInfo
diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts
index 4c9f0c5f8..3c56bf45b 100644
--- a/server/tests/cli/reset-password.ts
+++ b/server/tests/cli/reset-password.ts
@@ -10,7 +10,7 @@ import {
10 runServer, 10 runServer,
11 ServerInfo, 11 ServerInfo,
12 setAccessTokensToServers 12 setAccessTokensToServers
13} from '../../../shared/utils' 13} from '../../../shared/extra-utils'
14 14
15describe('Test reset password scripts', function () { 15describe('Test reset password scripts', function () {
16 let server: ServerInfo 16 let server: ServerInfo
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 39533edea..2270ff494 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -3,8 +3,8 @@
3import 'mocha' 3import 'mocha'
4import * as chai from 'chai' 4import * as chai from 'chai'
5import { VideoDetails } from '../../../shared/models/videos' 5import { VideoDetails } from '../../../shared/models/videos'
6import { waitJobs } from '../../../shared/utils/server/jobs' 6import { waitJobs } from '../../../shared/extra-utils/server/jobs'
7import { addVideoCommentThread } from '../../../shared/utils/videos/video-comments' 7import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments'
8import { 8import {
9 addVideoChannel, 9 addVideoChannel,
10 createUser, 10 createUser,
@@ -21,8 +21,8 @@ import {
21 ServerInfo, 21 ServerInfo,
22 setAccessTokensToServers, 22 setAccessTokensToServers,
23 uploadVideo 23 uploadVideo
24} from '../../../shared/utils' 24} from '../../../shared/extra-utils'
25import { getAccountsList } from '../../../shared/utils/users/accounts' 25import { getAccountsList } from '../../../shared/extra-utils/users/accounts'
26 26
27const expect = chai.expect 27const expect = chai.expect
28 28
diff --git a/server/tests/client.ts b/server/tests/client.ts
index 06b4a9c5a..116189510 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -15,7 +15,7 @@ import {
15 updateCustomConfig, 15 updateCustomConfig,
16 updateCustomSubConfig, 16 updateCustomSubConfig,
17 uploadVideo 17 uploadVideo
18} from '../../shared/utils' 18} from '../../shared/extra-utils'
19 19
20const expect = chai.expect 20const expect = chai.expect
21 21
diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts
index d632be427..0e9ea1a18 100644
--- a/server/tests/feeds/feeds.ts
+++ b/server/tests/feeds/feeds.ts
@@ -13,10 +13,10 @@ import {
13 ServerInfo, 13 ServerInfo,
14 setAccessTokensToServers, 14 setAccessTokensToServers,
15 uploadVideo, userLogin 15 uploadVideo, userLogin
16} from '../../../shared/utils' 16} from '../../../shared/extra-utils'
17import * as libxmljs from 'libxmljs' 17import * as libxmljs from 'libxmljs'
18import { addVideoCommentThread } from '../../../shared/utils/videos/video-comments' 18import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments'
19import { waitJobs } from '../../../shared/utils/server/jobs' 19import { waitJobs } from '../../../shared/extra-utils/server/jobs'
20import { User } from '../../../shared/models/users' 20import { User } from '../../../shared/models/users'
21 21
22chai.use(require('chai-xml')) 22chai.use(require('chai-xml'))
diff --git a/server/tests/helpers/request.ts b/server/tests/helpers/request.ts
index 95a74fdfa..a754bc6e2 100644
--- a/server/tests/helpers/request.ts
+++ b/server/tests/helpers/request.ts
@@ -2,7 +2,7 @@
2 2
3import 'mocha' 3import 'mocha'
4import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests' 4import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
5import { get4KFileUrl, root, wait } from '../../../shared/utils' 5import { get4KFileUrl, root, wait } from '../../../shared/extra-utils'
6import { join } from 'path' 6import { join } from 'path'
7import { pathExists, remove } from 'fs-extra' 7import { pathExists, remove } from 'fs-extra'
8import { expect } from 'chai' 8import { expect } from 'chai'
diff --git a/server/tests/misc-endpoints.ts b/server/tests/misc-endpoints.ts
index 104876f2f..d78b62d60 100644
--- a/server/tests/misc-endpoints.ts
+++ b/server/tests/misc-endpoints.ts
@@ -12,7 +12,7 @@ import {
12 ServerInfo, 12 ServerInfo,
13 setAccessTokensToServers, 13 setAccessTokensToServers,
14 uploadVideo 14 uploadVideo
15} from '../../shared/utils' 15} from '../../shared/extra-utils'
16import { VideoPrivacy } from '../../shared/models/videos' 16import { VideoPrivacy } from '../../shared/models/videos'
17 17
18const expect = chai.expect 18const expect = chai.expect
diff --git a/server/tests/real-world/populate-database.ts b/server/tests/real-world/populate-database.ts
index 3616127ad..459c9cbd8 100644
--- a/server/tests/real-world/populate-database.ts
+++ b/server/tests/real-world/populate-database.ts
@@ -10,7 +10,7 @@ import {
10 ServerInfo, 10 ServerInfo,
11 setAccessTokensToServers, 11 setAccessTokensToServers,
12 uploadVideo 12 uploadVideo
13} from '../../../shared/utils' 13} from '../../../shared/extra-utils'
14import * as Bluebird from 'bluebird' 14import * as Bluebird from 'bluebird'
15 15
16start() 16start()
diff --git a/server/tests/real-world/real-world.ts b/server/tests/real-world/real-world.ts
index ac3baaf9a..8b070004d 100644
--- a/server/tests/real-world/real-world.ts
+++ b/server/tests/real-world/real-world.ts
@@ -16,8 +16,8 @@ import {
16 updateVideo, 16 updateVideo,
17 uploadVideo, viewVideo, 17 uploadVideo, viewVideo,
18 wait 18 wait
19} from '../../../shared/utils' 19} from '../../../shared/extra-utils'
20import { getJobsListPaginationAndSort } from '../../../shared/utils/server/jobs' 20import { getJobsListPaginationAndSort } from '../../../shared/extra-utils/server/jobs'
21 21
22interface ServerInfo extends DefaultServerInfo { 22interface ServerInfo extends DefaultServerInfo {
23 requestsNumber: number 23 requestsNumber: number
diff --git a/server/tools/peertube-get-access-token.ts b/server/tools/peertube-get-access-token.ts
index a68665f5b..85660de2c 100644
--- a/server/tools/peertube-get-access-token.ts
+++ b/server/tools/peertube-get-access-token.ts
@@ -6,7 +6,7 @@ import {
6 Server, 6 Server,
7 Client, 7 Client,
8 User 8 User
9} from '../../shared/utils' 9} from '../../shared/extra-utils'
10 10
11program 11program
12 .option('-u, --url <url>', 'Server url') 12 .option('-u, --url <url>', 'Server url')
diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts
index 03f13b5e2..8c4c711f7 100644
--- a/server/tools/peertube-import-videos.ts
+++ b/server/tools/peertube-import-videos.ts
@@ -6,7 +6,7 @@ import { join } from 'path'
6import { VideoPrivacy } from '../../shared/models/videos' 6import { VideoPrivacy } from '../../shared/models/videos'
7import { doRequestAndSaveToFile } from '../helpers/requests' 7import { doRequestAndSaveToFile } from '../helpers/requests'
8import { CONSTRAINTS_FIELDS } from '../initializers/constants' 8import { CONSTRAINTS_FIELDS } from '../initializers/constants'
9import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../../shared/utils/index' 9import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../../shared/extra-utils/index'
10import { truncate } from 'lodash' 10import { truncate } from 'lodash'
11import * as prompt from 'prompt' 11import * as prompt from 'prompt'
12import { remove } from 'fs-extra' 12import { remove } from 'fs-extra'
diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index ebc62c965..13ca94e51 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,8 +1,8 @@
1import * as program from 'commander' 1import * as program from 'commander'
2import { access, constants } from 'fs-extra' 2import { access, constants } from 'fs-extra'
3import { isAbsolute } from 'path' 3import { isAbsolute } from 'path'
4import { getClient, login } from '../../shared/utils' 4import { getClient, login } from '../../shared/extra-utils'
5import { uploadVideo } from '../../shared/utils/' 5import { uploadVideo } from '../../shared/extra-utils/'
6import { VideoPrivacy } from '../../shared/models/videos' 6import { VideoPrivacy } from '../../shared/models/videos'
7import { netrc, getSettings } from './cli' 7import { netrc, getSettings } from './cli'
8 8