diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-13 11:05:15 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-20 15:27:18 +0200 |
commit | 41d1d075011174e73dccb74006181a92a618d7b4 (patch) | |
tree | 4dc1af0e266977f062cf9716837d04de1cdd628d /server/tests/api/moderation/blocklist-notification.ts | |
parent | 6c5065a011b099618681a37bd77eaa7bd3db752e (diff) | |
download | PeerTube-41d1d075011174e73dccb74006181a92a618d7b4.tar.gz PeerTube-41d1d075011174e73dccb74006181a92a618d7b4.tar.zst PeerTube-41d1d075011174e73dccb74006181a92a618d7b4.zip |
Introduce login command
Diffstat (limited to 'server/tests/api/moderation/blocklist-notification.ts')
-rw-r--r-- | server/tests/api/moderation/blocklist-notification.ts | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/tests/api/moderation/blocklist-notification.ts b/server/tests/api/moderation/blocklist-notification.ts index b676a4db4..4f2be6198 100644 --- a/server/tests/api/moderation/blocklist-notification.ts +++ b/server/tests/api/moderation/blocklist-notification.ts | |||
@@ -10,7 +10,6 @@ import { | |||
10 | ServerInfo, | 10 | ServerInfo, |
11 | setAccessTokensToServers, | 11 | setAccessTokensToServers, |
12 | uploadVideo, | 12 | uploadVideo, |
13 | userLogin, | ||
14 | waitJobs | 13 | waitJobs |
15 | } from '@shared/extra-utils' | 14 | } from '@shared/extra-utils' |
16 | import { UserNotificationType } from '@shared/models' | 15 | import { UserNotificationType } from '@shared/models' |
@@ -86,7 +85,7 @@ describe('Test blocklist', function () { | |||
86 | videoQuotaDaily: -1 | 85 | videoQuotaDaily: -1 |
87 | }) | 86 | }) |
88 | 87 | ||
89 | userToken1 = await userLogin(servers[0], user) | 88 | userToken1 = await servers[0].loginCommand.getAccessToken(user) |
90 | await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' }) | 89 | await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' }) |
91 | } | 90 | } |
92 | 91 | ||
@@ -94,14 +93,14 @@ describe('Test blocklist', function () { | |||
94 | const user = { username: 'user2', password: 'password' } | 93 | const user = { username: 'user2', 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 | userToken2 = await userLogin(servers[0], user) | 96 | userToken2 = await servers[0].loginCommand.getAccessToken(user) |
98 | } | 97 | } |
99 | 98 | ||
100 | { | 99 | { |
101 | const user = { username: 'user3', password: 'password' } | 100 | const user = { username: 'user3', password: 'password' } |
102 | await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password }) | 101 | await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password }) |
103 | 102 | ||
104 | remoteUserToken = await userLogin(servers[1], user) | 103 | remoteUserToken = await servers[1].loginCommand.getAccessToken(user) |
105 | } | 104 | } |
106 | 105 | ||
107 | await doubleFollow(servers[0], servers[1]) | 106 | await doubleFollow(servers[0], servers[1]) |