From 24b9417cec5cc785a57b2fe169a1ae88b88801a4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 8 Oct 2018 15:51:38 +0200 Subject: Add users search filter --- server/tests/api/users/users.ts | 36 +++++++++++++++++++++++++++++++++++- server/tests/utils/users/users.ts | 3 ++- 2 files changed, 37 insertions(+), 2 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index 8b9c6b455..513bca8a0 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -180,7 +180,7 @@ describe('Test users', function () { it('Should be able to upload a video again') it('Should be able to create a new user', async function () { - await createUser(server.url, accessToken, user.username,user.password, 2 * 1024 * 1024) + await createUser(server.url, accessToken, user.username, user.password, 2 * 1024 * 1024) }) it('Should be able to login with this user', async function () { @@ -322,6 +322,40 @@ describe('Test users', function () { expect(users[ 1 ].nsfwPolicy).to.equal('display') }) + it('Should search user by username', async function () { + const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'oot') + const users = res.body.data as User[] + + expect(res.body.total).to.equal(1) + expect(users.length).to.equal(1) + + expect(users[ 0 ].username).to.equal('root') + }) + + it('Should search user by email', async function () { + { + const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'r_1@exam') + const users = res.body.data as User[] + + expect(res.body.total).to.equal(1) + expect(users.length).to.equal(1) + + expect(users[ 0 ].username).to.equal('user_1') + expect(users[ 0 ].email).to.equal('user_1@example.com') + } + + { + const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'example') + const users = res.body.data as User[] + + expect(res.body.total).to.equal(2) + expect(users.length).to.equal(2) + + expect(users[ 0 ].username).to.equal('root') + expect(users[ 1 ].username).to.equal('user_1') + } + }) + it('Should update my password', async function () { await updateMyUser({ url: server.url, diff --git a/server/tests/utils/users/users.ts b/server/tests/utils/users/users.ts index 41d8ce265..d77233d62 100644 --- a/server/tests/utils/users/users.ts +++ b/server/tests/utils/users/users.ts @@ -112,7 +112,7 @@ function getUsersList (url: string, accessToken: string) { .expect('Content-Type', /json/) } -function getUsersListPaginationAndSort (url: string, accessToken: string, start: number, count: number, sort: string) { +function getUsersListPaginationAndSort (url: string, accessToken: string, start: number, count: number, sort: string, search?: string) { const path = '/api/v1/users' return request(url) @@ -120,6 +120,7 @@ function getUsersListPaginationAndSort (url: string, accessToken: string, start: .query({ start }) .query({ count }) .query({ sort }) + .query({ search }) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + accessToken) .expect(200) -- cgit v1.2.3