diff options
Diffstat (limited to 'server/tests/api')
-rw-r--r-- | server/tests/api/check-params/users.ts | 20 | ||||
-rw-r--r-- | server/tests/api/users.ts | 14 |
2 files changed, 28 insertions, 6 deletions
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 578fece49..1e3533bf3 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts | |||
@@ -67,6 +67,7 @@ describe('Test users API validators', function () { | |||
67 | .get(path) | 67 | .get(path) |
68 | .query({ start: 'hello' }) | 68 | .query({ start: 'hello' }) |
69 | .set('Accept', 'application/json') | 69 | .set('Accept', 'application/json') |
70 | .set('Authorization', 'Bearer ' + server.accessToken) | ||
70 | .expect(400) | 71 | .expect(400) |
71 | }) | 72 | }) |
72 | 73 | ||
@@ -75,6 +76,7 @@ describe('Test users API validators', function () { | |||
75 | .get(path) | 76 | .get(path) |
76 | .query({ count: 'hello' }) | 77 | .query({ count: 'hello' }) |
77 | .set('Accept', 'application/json') | 78 | .set('Accept', 'application/json') |
79 | .set('Authorization', 'Bearer ' + server.accessToken) | ||
78 | .expect(400) | 80 | .expect(400) |
79 | }) | 81 | }) |
80 | 82 | ||
@@ -83,8 +85,24 @@ describe('Test users API validators', function () { | |||
83 | .get(path) | 85 | .get(path) |
84 | .query({ sort: 'hello' }) | 86 | .query({ sort: 'hello' }) |
85 | .set('Accept', 'application/json') | 87 | .set('Accept', 'application/json') |
88 | .set('Authorization', 'Bearer ' + server.accessToken) | ||
86 | .expect(400) | 89 | .expect(400) |
87 | }) | 90 | }) |
91 | |||
92 | it('Should fail with a non authenticated user', async function () { | ||
93 | await request(server.url) | ||
94 | .get(path) | ||
95 | .set('Accept', 'application/json') | ||
96 | .expect(401) | ||
97 | }) | ||
98 | |||
99 | it('Should fail with a non admin user', async function () { | ||
100 | await request(server.url) | ||
101 | .get(path) | ||
102 | .set('Accept', 'application/json') | ||
103 | .set('Authorization', 'Bearer ' + userAccessToken) | ||
104 | .expect(403) | ||
105 | }) | ||
88 | }) | 106 | }) |
89 | 107 | ||
90 | describe('When adding a new user', function () { | 108 | describe('When adding a new user', function () { |
@@ -354,7 +372,7 @@ describe('Test users API validators', function () { | |||
354 | describe('When updating a user', function () { | 372 | describe('When updating a user', function () { |
355 | 373 | ||
356 | before(async function () { | 374 | before(async function () { |
357 | const res = await getUsersList(server.url) | 375 | const res = await getUsersList(server.url, server.accessToken) |
358 | 376 | ||
359 | userId = res.body.data[1].id | 377 | userId = res.body.data[1].id |
360 | rootId = res.body.data[2].id | 378 | rootId = res.body.data[2].id |
diff --git a/server/tests/api/users.ts b/server/tests/api/users.ts index 5c0531571..33646e84f 100644 --- a/server/tests/api/users.ts +++ b/server/tests/api/users.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | /* tslint:disable:no-unused-expression */ | 1 | /* tslint:disable:no-unused-expression */ |
2 | |||
2 | import * as chai from 'chai' | 3 | import * as chai from 'chai' |
3 | import 'mocha' | 4 | import 'mocha' |
4 | import { UserRole } from '../../../shared' | 5 | import { UserRole } from '../../../shared' |
@@ -28,6 +29,7 @@ import { | |||
28 | } from '../utils' | 29 | } from '../utils' |
29 | import { follow } from '../utils/follows' | 30 | import { follow } from '../utils/follows' |
30 | import { getMyVideos } from '../utils/videos' | 31 | import { getMyVideos } from '../utils/videos' |
32 | import { setAccessTokensToServers } from '../utils/login' | ||
31 | 33 | ||
32 | const expect = chai.expect | 34 | const expect = chai.expect |
33 | 35 | ||
@@ -43,6 +45,8 @@ describe('Test users', function () { | |||
43 | 45 | ||
44 | await flushTests() | 46 | await flushTests() |
45 | server = await runServer(1) | 47 | server = await runServer(1) |
48 | |||
49 | await setAccessTokensToServers([ server ]) | ||
46 | }) | 50 | }) |
47 | 51 | ||
48 | it('Should create a new client') | 52 | it('Should create a new client') |
@@ -242,7 +246,7 @@ describe('Test users', function () { | |||
242 | }) | 246 | }) |
243 | 247 | ||
244 | it('Should list all the users', async function () { | 248 | it('Should list all the users', async function () { |
245 | const res = await getUsersList(server.url) | 249 | const res = await getUsersList(server.url, server.accessToken) |
246 | const result = res.body | 250 | const result = res.body |
247 | const total = result.total | 251 | const total = result.total |
248 | const users = result.data | 252 | const users = result.data |
@@ -280,7 +284,7 @@ describe('Test users', function () { | |||
280 | }) | 284 | }) |
281 | 285 | ||
282 | it('Should list only the first user by username asc', async function () { | 286 | it('Should list only the first user by username asc', async function () { |
283 | const res = await getUsersListPaginationAndSort(server.url, 0, 1, 'username') | 287 | const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, 'username') |
284 | 288 | ||
285 | const result = res.body | 289 | const result = res.body |
286 | const total = result.total | 290 | const total = result.total |
@@ -307,7 +311,7 @@ describe('Test users', function () { | |||
307 | }) | 311 | }) |
308 | 312 | ||
309 | it('Should list only the first user by username desc', async function () { | 313 | it('Should list only the first user by username desc', async function () { |
310 | const res = await getUsersListPaginationAndSort(server.url, 0, 1, '-username') | 314 | const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, '-username') |
311 | const result = res.body | 315 | const result = res.body |
312 | const total = result.total | 316 | const total = result.total |
313 | const users = result.data | 317 | const users = result.data |
@@ -330,7 +334,7 @@ describe('Test users', function () { | |||
330 | }) | 334 | }) |
331 | 335 | ||
332 | it('Should list only the second user by createdAt desc', async function () { | 336 | it('Should list only the second user by createdAt desc', async function () { |
333 | const res = await getUsersListPaginationAndSort(server.url, 0, 1, '-createdAt') | 337 | const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, '-createdAt') |
334 | const result = res.body | 338 | const result = res.body |
335 | const total = result.total | 339 | const total = result.total |
336 | const users = result.data | 340 | const users = result.data |
@@ -353,7 +357,7 @@ describe('Test users', function () { | |||
353 | }) | 357 | }) |
354 | 358 | ||
355 | it('Should list all the users by createdAt asc', async function () { | 359 | it('Should list all the users by createdAt asc', async function () { |
356 | const res = await getUsersListPaginationAndSort(server.url, 0, 2, 'createdAt') | 360 | const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt') |
357 | const result = res.body | 361 | const result = res.body |
358 | const total = result.total | 362 | const total = result.total |
359 | const users = result.data | 363 | const users = result.data |