Fix tests and user quota

[github/Chocobozzz/PeerTube.git] / server / tests / utils / users.ts

diff --git a/server/tests/utils/users.ts b/server/tests/utils/users.ts
index 6e4b5f2f563e902f514bc721d0f36029f260734e..e5f3eb1b3a2724e65894b74c11f9fc5bfa803ca6 100644 (file)
--- a/server/tests/utils/users.ts
+++ b/server/tests/utils/users.ts
@@ -1,11 +1,12 @@
 import * as request from 'supertest'
 
-function createUser (url: string, accessToken: string, username: string, password: string, specialStatus = 204) {
+function createUser (url: string, accessToken: string, username: string, password: string, videoQuota = 1000000, specialStatus = 204) {
   const path = '/api/v1/users'
   const body = {
     username,
     password,
-    email: username + '@example.com'
+    email: username + '@example.com',
+    videoQuota
   }
 
   return request(url)
@@ -31,7 +32,7 @@ function registerUser (url: string, username: string, password: string, specialS
           .expect(specialStatus)
 }
 
-function getUserInformation (url: string, accessToken: string) {
+function getMyUserInformation (url: string, accessToken: string) {
   const path = '/api/v1/users/me'
 
   return request(url)
@@ -42,6 +43,17 @@ function getUserInformation (url: string, accessToken: string) {
           .expect('Content-Type', /json/)
 }
 
+function getUserInformation (url: string, accessToken: string, userId: number) {
+  const path = '/api/v1/users/' + userId
+
+  return request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .set('Authorization', 'Bearer ' + accessToken)
+    .expect(200)
+    .expect('Content-Type', /json/)
+}
+
 function getUserVideoRating (url: string, accessToken: string, videoId: number) {
   const path = '/api/v1/users/me/videos/' + videoId + '/rating'
 
@@ -86,12 +98,28 @@ function removeUser (url: string, userId: number, accessToken: string, expectedS
           .expect(expectedStatus)
 }
 
-function updateUser (url: string, userId: number, accessToken: string, newPassword: string, displayNSFW: boolean) {
-  const path = '/api/v1/users/' + userId
+function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean, email?: string) {
+  const path = '/api/v1/users/me'
 
   const toSend = {}
   if (newPassword !== undefined && newPassword !== null) toSend['password'] = newPassword
   if (displayNSFW !== undefined && displayNSFW !== null) toSend['displayNSFW'] = displayNSFW
+  if (email !== undefined && email !== null) toSend['email'] = email
+
+  return request(url)
+    .put(path)
+    .set('Accept', 'application/json')
+    .set('Authorization', 'Bearer ' + accessToken)
+    .send(toSend)
+    .expect(204)
+}
+
+function updateUser (url: string, userId: number, accessToken: string, email: string, videoQuota: number) {
+  const path = '/api/v1/users/' + userId
+
+  const toSend = {}
+  if (email !== undefined && email !== null) toSend['email'] = email
+  if (videoQuota !== undefined && videoQuota !== null) toSend['videoQuota'] = videoQuota
 
   return request(url)
           .put(path)
@@ -106,10 +134,12 @@ function updateUser (url: string, userId: number, accessToken: string, newPasswo
 export {
   createUser,
   registerUser,
-  getUserInformation,
+  getMyUserInformation,
   getUserVideoRating,
   getUsersList,
   getUsersListPaginationAndSort,
   removeUser,
-  updateUser
+  updateUser,
+  updateMyUser,
+  getUserInformation
 }