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/check-params | |
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/check-params')
-rw-r--r-- | server/tests/api/check-params/users.ts | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/video-blacklist.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 6e737af15..94d47408a 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts | |||
@@ -188,7 +188,7 @@ describe('Test users API validators', function () { | |||
188 | videoQuota: -1, | 188 | videoQuota: -1, |
189 | videoQuotaDaily: -1, | 189 | videoQuotaDaily: -1, |
190 | role: UserRole.USER, | 190 | role: UserRole.USER, |
191 | adminFlags: UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST | 191 | adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK |
192 | } | 192 | } |
193 | 193 | ||
194 | it('Should fail with a too small username', async function () { | 194 | it('Should fail with a too small username', async function () { |
diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts index 145f43980..b96c26989 100644 --- a/server/tests/api/check-params/video-blacklist.ts +++ b/server/tests/api/check-params/video-blacklist.ts | |||
@@ -24,7 +24,7 @@ import { | |||
24 | checkBadSortPagination, | 24 | checkBadSortPagination, |
25 | checkBadStartPagination | 25 | checkBadStartPagination |
26 | } from '../../../../shared/extra-utils/requests/check-api-params' | 26 | } from '../../../../shared/extra-utils/requests/check-api-params' |
27 | import { VideoBlacklistType, VideoDetails } from '../../../../shared/models/videos' | 27 | import { VideoBlockType, VideoDetails } from '../../../../shared/models/videos' |
28 | import { expect } from 'chai' | 28 | import { expect } from 'chai' |
29 | 29 | ||
30 | describe('Test video blacklist API validators', function () { | 30 | describe('Test video blacklist API validators', function () { |
@@ -243,7 +243,7 @@ describe('Test video blacklist API validators', function () { | |||
243 | }) | 243 | }) |
244 | 244 | ||
245 | it('Should succeed with the correct parameters', async function () { | 245 | it('Should succeed with the correct parameters', async function () { |
246 | await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, type: VideoBlacklistType.MANUAL }) | 246 | await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, type: VideoBlockType.MANUAL }) |
247 | }) | 247 | }) |
248 | }) | 248 | }) |
249 | 249 | ||