aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/api/users
diff options
context:
space:
mode:
Diffstat (limited to 'server/tests/api/users')
-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
5 files changed, 31 insertions, 24 deletions
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