diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-02 20:50:42 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-10 21:12:05 +0200 |
commit | 5baee5fca418487e72ddcd6419d31bca8659b668 (patch) | |
tree | 6604cc16d42152f4929d888565d2d435e2480d47 /server/tests/api/users | |
parent | d840487fed32b4604b02030c0d7464afa925904f (diff) | |
download | PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.gz PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.zst PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.zip |
rename blacklist to block/blocklist, merge block and auto-block views
- also replace whitelist with allowlist
- add advanced filters for video-block-list view
- move icons in video-block-list and video-abuse-list to left side
for visibility
- add robot icon to depict automated nature of a block in
video-block-list
resolves #2790
Diffstat (limited to 'server/tests/api/users')
-rw-r--r-- | server/tests/api/users/users.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index c0cbce360..af5a5fd25 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts | |||
@@ -265,7 +265,7 @@ describe('Test users', function () { | |||
265 | username: user.username, | 265 | username: user.username, |
266 | password: user.password, | 266 | password: user.password, |
267 | videoQuota: 2 * 1024 * 1024, | 267 | videoQuota: 2 * 1024 * 1024, |
268 | adminFlags: UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST | 268 | adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK |
269 | }) | 269 | }) |
270 | }) | 270 | }) |
271 | 271 | ||
@@ -292,7 +292,7 @@ describe('Test users', function () { | |||
292 | } | 292 | } |
293 | 293 | ||
294 | expect(userMe.adminFlags).to.be.undefined | 294 | expect(userMe.adminFlags).to.be.undefined |
295 | expect(userGet.adminFlags).to.equal(UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST) | 295 | expect(userGet.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK) |
296 | 296 | ||
297 | expect(userMe.specialPlaylists).to.have.lengthOf(1) | 297 | expect(userMe.specialPlaylists).to.have.lengthOf(1) |
298 | expect(userMe.specialPlaylists[0].type).to.equal(VideoPlaylistType.WATCH_LATER) | 298 | expect(userMe.specialPlaylists[0].type).to.equal(VideoPlaylistType.WATCH_LATER) |