X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers.ts;h=1ea599859313a7310a3f71e4b5fffb61db8f1ab1;hb=ed56ad1193bb5bb0a81fb843a11eb90d3fed9861;hp=a13807b5c07a8eec32e1c69901c1f63c74b679e6;hpb=5960f92395e81cc851d4536325bee72ba930de3f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index a13807b5c..1ea599859 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -4,9 +4,9 @@ import * as chai from 'chai'
 import 'mocha'
 import { UserRole } from '../../../../shared/index'
 import {
-  createUser, flushTests, getBlacklistedVideosList, getMyUserInformation, getMyUserVideoRating, getUserInformation, getUsersList,
-  getUsersListPaginationAndSort, getVideosList, killallServers, login, makePutBodyRequest, rateVideo, registerUser, removeUser, removeVideo,
-  runServer, ServerInfo, serverLogin, updateMyUser, updateUser, uploadVideo
+  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'
@@ -20,9 +20,13 @@ describe('Test users', function () {
   let accessTokenUser: string
   let videoId: number
   let userId: number
+  const user = {
+    username: 'user_1',
+    password: 'super password'
+  }
 
   before(async function () {
-    this.timeout(10000)
+    this.timeout(30000)
 
     await flushTests()
     server = await runServer(1)
@@ -40,36 +44,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.equal('Authentication failed.')
   })
 
   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.equal('Authentication failed.')
   })
 
   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.equal('Authentication failed.')
   })
 
   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.equal('Authentication failed.')
   })
 
   it('Should not be able to upload a video', async function () {
@@ -98,9 +94,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
   })
 
@@ -114,12 +108,8 @@ describe('Test users', function () {
     const res = await getMyUserVideoRating(server.url, accessToken, videoId)
     const rating = res.body
 
-    expect(rating.videoId)
-      .to
-      .equal(videoId)
-    expect(rating.rating)
-      .to
-      .equal('like')
+    expect(rating.videoId).to.equal(videoId)
+    expect(rating.rating).to.equal('like')
   })
 
   it('Should not be able to remove the video with an incorrect token', async function () {
@@ -165,65 +155,52 @@ 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_1', 'super 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 () {
-    server.user = {
-      username: 'user_1',
-      password: 'super password'
-    }
-
-    accessTokenUser = await serverLogin(server)
+    accessTokenUser = await userLogin(server, user)
   })
 
   it('Should be able to get the user information', async function () {
     const res = await getMyUserInformation(server.url, accessTokenUser)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.false
-    expect(user.videoQuota)
-      .to
-      .equal(2 * 1024 * 1024)
-    expect(user.roleLabel)
-      .to
-      .equal('User')
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    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 () {
     this.timeout(5000)
 
     const videoAttributes = {
-      name: 'super user video'
+      name: 'super user video',
+      fixture: 'video_short.webm'
     }
     await uploadVideo(server.url, accessTokenUser, videoAttributes)
   })
 
+  it('Should have video quota updated', async function () {
+    const res = await getMyUserVideoQuotaUsed(server.url, accessTokenUser)
+    const data = res.body
+
+    expect(data.videoQuotaUsed).to.equal(218910)
+  })
+
   it('Should be able to list my videos', async function () {
     const res = await getMyVideos(server.url, accessTokenUser, 0, 5)
-    expect(res.body.total)
-      .to
-      .equal(1)
+    expect(res.body.total).to.equal(1)
 
     const videos = res.body.data
-    expect(videos)
-      .to
-      .have
-      .lengthOf(1)
+    expect(videos).to.have.lengthOf(1)
 
-    expect(videos[ 0 ].name)
-      .to
-      .equal('super user video')
+    expect(videos[ 0 ].name).to.equal('super user video')
   })
 
   it('Should list all the users', async function () {
@@ -232,34 +209,19 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users)
-      .to
-      .be
-      .an('array')
-    expect(users.length)
-      .to
-      .equal(2)
+    expect(total).to.equal(2)
+    expect(users).to.be.an('array')
+    expect(users.length).to.equal(2)
 
     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.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    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(rootUser.username).to.equal('root')
+    expect(rootUser.email).to.equal('admin1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
 
     userId = user.id
   })
@@ -271,24 +233,14 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(1)
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(1)
 
     const user = users[ 0 ]
-    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.username).to.equal('root')
+    expect(user.email).to.equal('admin1@example.com')
+    expect(user.roleLabel).to.equal('Administrator')
+    expect(user.nsfwPolicy).to.equal('display')
   })
 
   it('Should list only the first user by username desc', async function () {
@@ -297,21 +249,13 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(1)
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(1)
 
     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.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
   })
 
   it('Should list only the second user by createdAt desc', async function () {
@@ -320,21 +264,13 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(1)
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(1)
 
     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.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
   })
 
   it('Should list all the users by createdAt asc', async function () {
@@ -343,28 +279,16 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(2)
-
-    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[ 1 ].username)
-      .to
-      .equal('user_1')
-    expect(users[ 1 ].email)
-      .to
-      .equal('user_1@example.com')
-    expect(users[ 1 ].displayNSFW).to.be.false
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(2)
+
+    expect(users[ 0 ].username).to.equal('root')
+    expect(users[ 0 ].email).to.equal('admin1@example.com')
+    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 ].nsfwPolicy).to.equal('display')
   })
 
   it('Should update my password', async function () {
@@ -373,35 +297,28 @@ describe('Test users', function () {
       accessToken: accessTokenUser,
       newPassword: 'new password'
     })
-    server.user.password = 'new password'
+    user.password = 'new password'
 
-    await login(server.url, server.client, server.user, 200)
+    await userLogin(server, user, 200)
   })
 
   it('Should be able to change the NSFW display attribute', async function () {
     await updateMyUser({
       url: server.url,
       accessToken: accessTokenUser,
-      displayNSFW: true
+      nsfwPolicy: 'do_not_list'
     })
 
     const res = await getMyUserInformation(server.url, accessTokenUser)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.ok
-    expect(user.videoQuota)
-      .to
-      .equal(2 * 1024 * 1024)
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@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('user_1')
+    expect(user.account.description).to.be.null
   })
 
   it('Should be able to change the autoPlayVideo attribute', async function () {
@@ -427,20 +344,66 @@ describe('Test users', function () {
     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.displayNSFW).to.be.ok
-    expect(user.videoQuota)
-      .to
-      .equal(2 * 1024 * 1024)
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    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('user_1')
+    expect(user.account.description).to.be.null
+  })
+
+  it('Should be able to update my avatar', async function () {
+    const fixture = 'avatar.png'
+
+    await updateMyAvatar({
+      url: server.url,
+      accessToken: accessTokenUser,
+      fixture
+    })
+
+    const res = await getMyUserInformation(server.url, accessTokenUser)
+    const user = res.body
+
+    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 () {
@@ -456,23 +419,18 @@ describe('Test users', function () {
     const res = await getUserInformation(server.url, accessToken, userId)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('updated2@example.com')
-    expect(user.displayNSFW).to.be.ok
-    expect(user.videoQuota)
-      .to
-      .equal(42)
-    expect(user.roleLabel)
-      .to
-      .equal('Moderator')
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('updated2@example.com')
+    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')
+  })
+
+  it('Should have removed the user token', async function () {
+    await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
+
+    accessTokenUser = await userLogin(server, user)
   })
 
   it('Should not be able to delete a user by a moderator', async function () {
@@ -488,21 +446,16 @@ describe('Test users', function () {
   })
 
   it('Should not be able to login with this user', async function () {
-    // server.user is already set to user 1
-    await login(server.url, server.client, server.user, 400)
+    await userLogin(server, user, 400)
   })
 
   it('Should not have videos of this user', async function () {
     const res = await getVideosList(server.url)
 
-    expect(res.body.total)
-      .to
-      .equal(1)
+    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 () {
@@ -510,21 +463,19 @@ describe('Test users', function () {
   })
 
   it('Should be able to login with this registered user', async function () {
-    server.user = {
+    const user15 = {
       username: 'user_15',
       password: 'my super password'
     }
 
-    accessToken = await serverLogin(server)
+    accessToken = await userLogin(server, user15)
   })
 
   it('Should have the correct video quota', async function () {
     const res = await getMyUserInformation(server.url, accessToken)
     const user = res.body
 
-    expect(user.videoQuota)
-      .to
-      .equal(5 * 1024 * 1024)
+    expect(user.videoQuota).to.equal(5 * 1024 * 1024)
   })
 
   after(async function () {