diff options
| author | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
| commit | fa58a19819cb821a5c5a26802efd492461be9c04 (patch) | |
| tree | 72bd8307da8ac447bb9934b1301ab0d93ea97e6b /server/tests/api/videos | |
| parent | 50a04125dac1a126cb79a9fb575fcf673c5ac2d6 (diff) | |
| parent | e95bede8fe660a38c99e51560caa5dd58a8eb23e (diff) | |
| download | PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.gz PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.zst PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.zip | |
Merge branch 'blacklist' into 'develop'
rename blacklist to block/blocklist, merge block and auto-block views
See merge request framasoft/peertube/PeerTube!30
Diffstat (limited to 'server/tests/api/videos')
| -rw-r--r-- | server/tests/api/videos/video-blacklist.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index 67bc0114c..a8500627b 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts | |||
| @@ -396,7 +396,7 @@ describe('Test video blacklist', function () { | |||
| 396 | url: servers[0].url, | 396 | url: servers[0].url, |
| 397 | accessToken: servers[0].accessToken, | 397 | accessToken: servers[0].accessToken, |
| 398 | username: user.username, | 398 | username: user.username, |
| 399 | adminFlags: UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST, | 399 | adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST, |
| 400 | password: user.password, | 400 | password: user.password, |
| 401 | role: UserRole.USER | 401 | role: UserRole.USER |
| 402 | }) | 402 | }) |