diff options
Diffstat (limited to 'server/tests/api/moderation/blocklist.ts')
-rw-r--r-- | server/tests/api/moderation/blocklist.ts | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts index 44e3de4e4..c38a7dad4 100644 --- a/server/tests/api/moderation/blocklist.ts +++ b/server/tests/api/moderation/blocklist.ts | |||
@@ -14,7 +14,6 @@ import { | |||
14 | ServerInfo, | 14 | ServerInfo, |
15 | setAccessTokensToServers, | 15 | setAccessTokensToServers, |
16 | uploadVideo, | 16 | uploadVideo, |
17 | userLogin, | ||
18 | waitJobs | 17 | waitJobs |
19 | } from '@shared/extra-utils' | 18 | } from '@shared/extra-utils' |
20 | import { UserNotificationType, Video } from '@shared/models' | 19 | import { UserNotificationType, Video } from '@shared/models' |
@@ -94,7 +93,7 @@ describe('Test blocklist', function () { | |||
94 | const user = { username: 'user1', password: 'password' } | 93 | const user = { username: 'user1', password: 'password' } |
95 | await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password }) | 94 | await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password }) |
96 | 95 | ||
97 | userToken1 = await userLogin(servers[0], user) | 96 | userToken1 = await servers[0].loginCommand.getAccessToken(user) |
98 | await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' }) | 97 | await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' }) |
99 | } | 98 | } |
100 | 99 | ||
@@ -102,14 +101,14 @@ describe('Test blocklist', function () { | |||
102 | const user = { username: 'moderator', password: 'password' } | 101 | const user = { username: 'moderator', password: 'password' } |
103 | await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password }) | 102 | await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password }) |
104 | 103 | ||
105 | userModeratorToken = await userLogin(servers[0], user) | 104 | userModeratorToken = await servers[0].loginCommand.getAccessToken(user) |
106 | } | 105 | } |
107 | 106 | ||
108 | { | 107 | { |
109 | const user = { username: 'user2', password: 'password' } | 108 | const user = { username: 'user2', password: 'password' } |
110 | await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password }) | 109 | await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password }) |
111 | 110 | ||
112 | userToken2 = await userLogin(servers[1], user) | 111 | userToken2 = await servers[1].loginCommand.getAccessToken(user) |
113 | await uploadVideo(servers[1].url, userToken2, { name: 'video user 2' }) | 112 | await uploadVideo(servers[1].url, userToken2, { name: 'video user 2' }) |
114 | } | 113 | } |
115 | 114 | ||