diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-13 14:23:01 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-20 15:27:18 +0200 |
commit | 7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0 (patch) | |
tree | 7a166515e4d57a06eb3c08be569f106ed049988b /server/tests/api/moderation/video-blacklist.ts | |
parent | d0a0fa429d4651710ed951a3c11af0219e408964 (diff) | |
download | PeerTube-7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0.tar.gz PeerTube-7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0.tar.zst PeerTube-7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0.zip |
Introduce user command
Diffstat (limited to 'server/tests/api/moderation/video-blacklist.ts')
-rw-r--r-- | server/tests/api/moderation/video-blacklist.ts | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/server/tests/api/moderation/video-blacklist.ts b/server/tests/api/moderation/video-blacklist.ts index b61effc57..ef25cfb8e 100644 --- a/server/tests/api/moderation/video-blacklist.ts +++ b/server/tests/api/moderation/video-blacklist.ts | |||
@@ -6,10 +6,8 @@ import { orderBy } from 'lodash' | |||
6 | import { | 6 | import { |
7 | BlacklistCommand, | 7 | BlacklistCommand, |
8 | cleanupTests, | 8 | cleanupTests, |
9 | createUser, | ||
10 | doubleFollow, | 9 | doubleFollow, |
11 | flushAndRunMultipleServers, | 10 | flushAndRunMultipleServers, |
12 | getMyUserInformation, | ||
13 | getMyVideos, | 11 | getMyVideos, |
14 | getVideosList, | 12 | getVideosList, |
15 | ImportsCommand, | 13 | ImportsCommand, |
@@ -21,7 +19,7 @@ import { | |||
21 | uploadVideo, | 19 | uploadVideo, |
22 | waitJobs | 20 | waitJobs |
23 | } from '@shared/extra-utils' | 21 | } from '@shared/extra-utils' |
24 | import { User, UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models' | 22 | import { UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models' |
25 | 23 | ||
26 | const expect = chai.expect | 24 | const expect = chai.expect |
27 | 25 | ||
@@ -356,9 +354,7 @@ describe('Test video blacklist', function () { | |||
356 | 354 | ||
357 | { | 355 | { |
358 | const user = { username: 'user_without_flag', password: 'password' } | 356 | const user = { username: 'user_without_flag', password: 'password' } |
359 | await createUser({ | 357 | await servers[0].usersCommand.create({ |
360 | url: servers[0].url, | ||
361 | accessToken: servers[0].accessToken, | ||
362 | username: user.username, | 358 | username: user.username, |
363 | adminFlags: UserAdminFlag.NONE, | 359 | adminFlags: UserAdminFlag.NONE, |
364 | password: user.password, | 360 | password: user.password, |
@@ -367,16 +363,13 @@ describe('Test video blacklist', function () { | |||
367 | 363 | ||
368 | userWithoutFlag = await servers[0].loginCommand.getAccessToken(user) | 364 | userWithoutFlag = await servers[0].loginCommand.getAccessToken(user) |
369 | 365 | ||
370 | const res = await getMyUserInformation(servers[0].url, userWithoutFlag) | 366 | const { videoChannels } = await servers[0].usersCommand.getMyInfo({ token: userWithoutFlag }) |
371 | const body: User = res.body | 367 | channelOfUserWithoutFlag = videoChannels[0].id |
372 | channelOfUserWithoutFlag = body.videoChannels[0].id | ||
373 | } | 368 | } |
374 | 369 | ||
375 | { | 370 | { |
376 | const user = { username: 'user_with_flag', password: 'password' } | 371 | const user = { username: 'user_with_flag', password: 'password' } |
377 | await createUser({ | 372 | await servers[0].usersCommand.create({ |
378 | url: servers[0].url, | ||
379 | accessToken: servers[0].accessToken, | ||
380 | username: user.username, | 373 | username: user.username, |
381 | adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST, | 374 | adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST, |
382 | password: user.password, | 375 | password: user.password, |