diff options
Diffstat (limited to 'server/tests/api/check-params/videos-filter.ts')
-rw-r--r-- | server/tests/api/check-params/videos-filter.ts | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/server/tests/api/check-params/videos-filter.ts b/server/tests/api/check-params/videos-filter.ts index 4d54a4fd0..d08570bbe 100644 --- a/server/tests/api/check-params/videos-filter.ts +++ b/server/tests/api/check-params/videos-filter.ts | |||
@@ -3,18 +3,15 @@ | |||
3 | import 'mocha' | 3 | import 'mocha' |
4 | import { | 4 | import { |
5 | cleanupTests, | 5 | cleanupTests, |
6 | createUser, | 6 | createSingleServer, |
7 | flushAndRunServer, | ||
8 | makeGetRequest, | 7 | makeGetRequest, |
9 | ServerInfo, | 8 | PeerTubeServer, |
10 | setAccessTokensToServers, | 9 | setAccessTokensToServers, |
11 | setDefaultVideoChannel, | 10 | setDefaultVideoChannel |
12 | userLogin | 11 | } from '@shared/extra-utils' |
13 | } from '../../../../shared/extra-utils' | 12 | import { HttpStatusCode, UserRole } from '@shared/models' |
14 | import { UserRole } from '../../../../shared/models/users' | ||
15 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | ||
16 | 13 | ||
17 | async function testEndpoints (server: ServerInfo, token: string, filter: string, statusCodeExpected: HttpStatusCode) { | 14 | async function testEndpoints (server: PeerTubeServer, token: string, filter: string, expectedStatus: HttpStatusCode) { |
18 | const paths = [ | 15 | const paths = [ |
19 | '/api/v1/video-channels/root_channel/videos', | 16 | '/api/v1/video-channels/root_channel/videos', |
20 | '/api/v1/accounts/root/videos', | 17 | '/api/v1/accounts/root/videos', |
@@ -30,13 +27,13 @@ async function testEndpoints (server: ServerInfo, token: string, filter: string, | |||
30 | query: { | 27 | query: { |
31 | filter | 28 | filter |
32 | }, | 29 | }, |
33 | statusCodeExpected | 30 | expectedStatus |
34 | }) | 31 | }) |
35 | } | 32 | } |
36 | } | 33 | } |
37 | 34 | ||
38 | describe('Test video filters validators', function () { | 35 | describe('Test video filters validators', function () { |
39 | let server: ServerInfo | 36 | let server: PeerTubeServer |
40 | let userAccessToken: string | 37 | let userAccessToken: string |
41 | let moderatorAccessToken: string | 38 | let moderatorAccessToken: string |
42 | 39 | ||
@@ -45,28 +42,19 @@ describe('Test video filters validators', function () { | |||
45 | before(async function () { | 42 | before(async function () { |
46 | this.timeout(30000) | 43 | this.timeout(30000) |
47 | 44 | ||
48 | server = await flushAndRunServer(1) | 45 | server = await createSingleServer(1) |
49 | 46 | ||
50 | await setAccessTokensToServers([ server ]) | 47 | await setAccessTokensToServers([ server ]) |
51 | await setDefaultVideoChannel([ server ]) | 48 | await setDefaultVideoChannel([ server ]) |
52 | 49 | ||
53 | const user = { username: 'user1', password: 'my super password' } | 50 | const user = { username: 'user1', password: 'my super password' } |
54 | await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password }) | 51 | await server.users.create({ username: user.username, password: user.password }) |
55 | userAccessToken = await userLogin(server, user) | 52 | userAccessToken = await server.login.getAccessToken(user) |
56 | 53 | ||
57 | const moderator = { username: 'moderator', password: 'my super password' } | 54 | const moderator = { username: 'moderator', password: 'my super password' } |
58 | await createUser( | 55 | await server.users.create({ username: moderator.username, password: moderator.password, role: UserRole.MODERATOR }) |
59 | { | 56 | |
60 | url: server.url, | 57 | moderatorAccessToken = await server.login.getAccessToken(moderator) |
61 | accessToken: server.accessToken, | ||
62 | username: moderator.username, | ||
63 | password: moderator.password, | ||
64 | videoQuota: undefined, | ||
65 | videoQuotaDaily: undefined, | ||
66 | role: UserRole.MODERATOR | ||
67 | } | ||
68 | ) | ||
69 | moderatorAccessToken = await userLogin(server, moderator) | ||
70 | }) | 58 | }) |
71 | 59 | ||
72 | describe('When setting a video filter', function () { | 60 | describe('When setting a video filter', function () { |
@@ -100,7 +88,7 @@ describe('Test video filters validators', function () { | |||
100 | await makeGetRequest({ | 88 | await makeGetRequest({ |
101 | url: server.url, | 89 | url: server.url, |
102 | path: '/feeds/videos.json', | 90 | path: '/feeds/videos.json', |
103 | statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401, | 91 | expectedStatus: HttpStatusCode.UNAUTHORIZED_401, |
104 | query: { | 92 | query: { |
105 | filter | 93 | filter |
106 | } | 94 | } |
@@ -112,7 +100,7 @@ describe('Test video filters validators', function () { | |||
112 | await makeGetRequest({ | 100 | await makeGetRequest({ |
113 | url: server.url, | 101 | url: server.url, |
114 | path: '/feeds/videos.json', | 102 | path: '/feeds/videos.json', |
115 | statusCodeExpected: HttpStatusCode.OK_200, | 103 | expectedStatus: HttpStatusCode.OK_200, |
116 | query: { | 104 | query: { |
117 | filter: 'local' | 105 | filter: 'local' |
118 | } | 106 | } |