X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers.ts;h=4914c8ed560271d994cf9ab61961a0400f50c577;hb=dc13348070d808d0ba3feb56a435b835c2e7e791;hp=c23b5808980991d768d74527d3c462a80b68f8c5;hpb=f8b8c36b2a92bfee435747ab5a0283924be76281;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index c23b58089..4914c8ed5 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -2,15 +2,40 @@ import * as chai from 'chai' import 'mocha' -import { UserRole } from '../../../../shared/index' +import { User, UserRole } from '../../../../shared/index' import { - createUser, flushTests, getBlacklistedVideosList, getMyUserInformation, getMyUserVideoQuotaUsed, getMyUserVideoRating, - getUserInformation, getUsersList, getUsersListPaginationAndSort, getVideosList, killallServers, login, makePutBodyRequest, rateVideo, - registerUser, removeUser, removeVideo, runServer, ServerInfo, testImage, updateMyAvatar, updateMyUser, updateUser, uploadVideo, userLogin -} from '../../utils/index' -import { follow } from '../../utils/server/follows' -import { setAccessTokensToServers } from '../../utils/users/login' -import { getMyVideos } from '../../utils/videos/videos' + blockUser, + createUser, + deleteMe, + flushTests, + getBlacklistedVideosList, + getMyUserInformation, + getMyUserVideoQuotaUsed, + getMyUserVideoRating, + getUserInformation, + getUsersList, + getUsersListPaginationAndSort, + getVideosList, + killallServers, + login, + makePutBodyRequest, + rateVideo, + registerUser, + removeUser, + removeVideo, + runServer, + ServerInfo, + testImage, + unblockUser, + updateMyAvatar, + updateMyUser, + updateUser, + uploadVideo, + userLogin +} from '../../../../shared/utils/index' +import { follow } from '../../../../shared/utils/server/follows' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' +import { getMyVideos } from '../../../../shared/utils/videos/videos' const expect = chai.expect @@ -44,28 +69,28 @@ describe('Test users', function () { const client = { id: 'client', secret: server.client.secret } const res = await login(server.url, client, server.user, 400) - expect(res.body.error).to.equal('Authentication failed.') + expect(res.body.error).to.contain('client is invalid') }) it('Should not login with an invalid client secret', async function () { const client = { id: server.client.id, secret: 'coucou' } const res = await login(server.url, client, server.user, 400) - expect(res.body.error).to.equal('Authentication failed.') + expect(res.body.error).to.contain('client is invalid') }) it('Should not login with an invalid username', async function () { const user = { username: 'captain crochet', password: server.user.password } const res = await login(server.url, server.client, user, 400) - expect(res.body.error).to.equal('Authentication failed.') + expect(res.body.error).to.contain('credentials are invalid') }) it('Should not login with an invalid password', async function () { const user = { username: server.user.username, password: 'mew_three' } const res = await login(server.url, server.client, user, 400) - expect(res.body.error).to.equal('Authentication failed.') + expect(res.body.error).to.contain('credentials are invalid') }) it('Should not be able to upload a video', async function () { @@ -94,7 +119,7 @@ describe('Test users', function () { const res = await getVideosList(server.url) const video = res.body.data[ 0 ] - expect(video.accountName).to.equal('root') + expect(video.account.name).to.equal('root') videoId = video.id }) @@ -155,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 () { @@ -168,10 +193,12 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.roleLabel).to.equal('User') expect(user.id).to.be.a('number') + expect(user.account.displayName).to.equal('user_1') + expect(user.account.description).to.be.null }) it('Should be able to upload a video with this user', async function () { @@ -189,6 +216,12 @@ describe('Test users', function () { const data = res.body expect(data.videoQuotaUsed).to.equal(218910) + + const resUsers = await getUsersList(server.url, server.accessToken) + + const users: User[] = resUsers.body.data + const tmpUser = users.find(u => u.username === user.username) + expect(tmpUser.videoQuotaUsed).to.equal(218910) }) it('Should be able to list my videos', async function () { @@ -214,12 +247,12 @@ describe('Test users', function () { const user = users[ 0 ] expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') const rootUser = users[ 1 ] expect(rootUser.username).to.equal('root') expect(rootUser.email).to.equal('admin1@example.com') - expect(rootUser.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') userId = user.id }) @@ -238,7 +271,7 @@ describe('Test users', function () { expect(user.username).to.equal('root') expect(user.email).to.equal('admin1@example.com') expect(user.roleLabel).to.equal('Administrator') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') }) it('Should list only the first user by username desc', async function () { @@ -253,7 +286,7 @@ describe('Test users', function () { const user = users[ 0 ] expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') }) it('Should list only the second user by createdAt desc', async function () { @@ -268,7 +301,7 @@ describe('Test users', function () { const user = users[ 0 ] expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') }) it('Should list all the users by createdAt asc', async function () { @@ -282,17 +315,52 @@ describe('Test users', function () { expect(users[ 0 ].username).to.equal('root') expect(users[ 0 ].email).to.equal('admin1@example.com') - expect(users[ 0 ].displayNSFW).to.be.false + expect(users[ 0 ].nsfwPolicy).to.equal('display') expect(users[ 1 ].username).to.equal('user_1') expect(users[ 1 ].email).to.equal('user_1@example.com') - expect(users[ 1 ].displayNSFW).to.be.false + 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, accessToken: accessTokenUser, + currentPassword: 'super password', newPassword: 'new password' }) user.password = 'new password' @@ -304,7 +372,7 @@ describe('Test users', function () { await updateMyUser({ url: server.url, accessToken: accessTokenUser, - displayNSFW: true + nsfwPolicy: 'do_not_list' }) const res = await getMyUserInformation(server.url, accessTokenUser) @@ -312,9 +380,11 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.id).to.be.a('number') + expect(user.account.displayName).to.equal('user_1') + expect(user.account.description).to.be.null }) it('Should be able to change the autoPlayVideo attribute', async function () { @@ -342,9 +412,11 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('updated@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.id).to.be.a('number') + expect(user.account.displayName).to.equal('user_1') + expect(user.account.description).to.be.null }) it('Should be able to update my avatar', async function () { @@ -359,8 +431,45 @@ describe('Test users', function () { const res = await getMyUserInformation(server.url, accessTokenUser) const user = res.body - const test = await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.png') - expect(test).to.equal(true) + await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.png') + }) + + it('Should be able to update my display name', async function () { + await updateMyUser({ + url: server.url, + accessToken: accessTokenUser, + displayName: 'new display name' + }) + + const res = await getMyUserInformation(server.url, accessTokenUser) + const user = res.body + + expect(user.username).to.equal('user_1') + expect(user.email).to.equal('updated@example.com') + expect(user.nsfwPolicy).to.equal('do_not_list') + expect(user.videoQuota).to.equal(2 * 1024 * 1024) + expect(user.id).to.be.a('number') + expect(user.account.displayName).to.equal('new display name') + expect(user.account.description).to.be.null + }) + + it('Should be able to update my description', async function () { + await updateMyUser({ + url: server.url, + accessToken: accessTokenUser, + description: 'my super description updated' + }) + + const res = await getMyUserInformation(server.url, accessTokenUser) + const user = res.body + + expect(user.username).to.equal('user_1') + expect(user.email).to.equal('updated@example.com') + expect(user.nsfwPolicy).to.equal('do_not_list') + expect(user.videoQuota).to.equal(2 * 1024 * 1024) + expect(user.id).to.be.a('number') + expect(user.account.displayName).to.equal('new display name') + expect(user.account.description).to.equal('my super description updated') }) it('Should be able to update another user', async function () { @@ -369,6 +478,7 @@ describe('Test users', function () { userId, accessToken, email: 'updated2@example.com', + emailVerified: true, videoQuota: 42, role: UserRole.MODERATOR }) @@ -378,7 +488,8 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('updated2@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.emailVerified).to.be.true + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(42) expect(user.roleLabel).to.equal('Moderator') expect(user.id).to.be.a('number') @@ -412,7 +523,7 @@ describe('Test users', function () { expect(res.body.total).to.equal(1) const video = res.body.data[ 0 ] - expect(video.accountName).to.equal('root') + expect(video.account.name).to.equal('root') }) it('Should register a new user', async function () { @@ -435,6 +546,41 @@ describe('Test users', function () { expect(user.videoQuota).to.equal(5 * 1024 * 1024) }) + it('Should remove me', async function () { + { + const res = await getUsersList(server.url, server.accessToken) + expect(res.body.data.find(u => u.username === 'user_15')).to.not.be.undefined + } + + await deleteMe(server.url, accessToken) + + { + const res = await getUsersList(server.url, server.accessToken) + expect(res.body.data.find(u => u.username === 'user_15')).to.be.undefined + } + }) + + it('Should block and unblock a user', async function () { + const user16 = { + username: 'user_16', + password: 'my super password' + } + const resUser = await createUser(server.url, server.accessToken, user16.username, user16.password) + const user16Id = resUser.body.user.id + + accessToken = await userLogin(server, user16) + + await getMyUserInformation(server.url, accessToken, 200) + await blockUser(server.url, user16Id, server.accessToken) + + await getMyUserInformation(server.url, accessToken, 401) + await userLogin(server, user16, 400) + + await unblockUser(server.url, user16Id, server.accessToken) + accessToken = await userLogin(server, user16) + await getMyUserInformation(server.url, accessToken, 200) + }) + after(async function () { killallServers([ server ])