Begin moving video channel to actor

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

diff --git a/server/tests/utils/users.ts b/server/tests/utils/users.ts
index e5f3eb1b3a2724e65894b74c11f9fc5bfa803ca6..a37d84ab479e8defb837e808648c77e962621b80 100644 (file)
--- a/server/tests/utils/users.ts
+++ b/server/tests/utils/users.ts
@@ -1,10 +1,21 @@
 import * as request from 'supertest'
 
-function createUser (url: string, accessToken: string, username: string, password: string, videoQuota = 1000000, specialStatus = 204) {
+import { UserRole } from '../../../shared'
+
+function createUser (
+  url: string,
+  accessToken: string,
+  username: string,
+  password: string,
+  videoQuota = 1000000,
+  role: UserRole = UserRole.USER,
+  specialStatus = 204
+) {
   const path = '/api/v1/users'
   const body = {
     username,
     password,
+    role,
     email: username + '@example.com',
     videoQuota
   }
@@ -65,17 +76,18 @@ function getUserVideoRating (url: string, accessToken: string, videoId: number)
           .expect('Content-Type', /json/)
 }
 
-function getUsersList (url: string) {
+function getUsersList (url: string, accessToken: string) {
   const path = '/api/v1/users'
 
   return request(url)
           .get(path)
           .set('Accept', 'application/json')
+          .set('Authorization', 'Bearer ' + accessToken)
           .expect(200)
           .expect('Content-Type', /json/)
 }
 
-function getUsersListPaginationAndSort (url: string, start: number, count: number, sort: string) {
+function getUsersListPaginationAndSort (url: string, accessToken: string, start: number, count: number, sort: string) {
   const path = '/api/v1/users'
 
   return request(url)
@@ -84,6 +96,7 @@ function getUsersListPaginationAndSort (url: string, start: number, count: numbe
           .query({ count })
           .query({ sort })
           .set('Accept', 'application/json')
+          .set('Authorization', 'Bearer ' + accessToken)
           .expect(200)
           .expect('Content-Type', /json/)
 }
@@ -98,12 +111,14 @@ function removeUser (url: string, userId: number, accessToken: string, expectedS
           .expect(expectedStatus)
 }
 
-function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean, email?: string) {
+function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean,
+  email?: string, autoPlayVideo?: boolean) {
   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 (autoPlayVideo !== undefined && autoPlayVideo !== null) toSend['autoPlayVideo'] = autoPlayVideo
   if (email !== undefined && email !== null) toSend['email'] = email
 
   return request(url)
@@ -114,12 +129,13 @@ function updateMyUser (url: string, accessToken: string, newPassword: string, di
     .expect(204)
 }
 
-function updateUser (url: string, userId: number, accessToken: string, email: string, videoQuota: number) {
+function updateUser (url: string, userId: number, accessToken: string, email: string, videoQuota: number, role: UserRole) {
   const path = '/api/v1/users/' + userId
 
   const toSend = {}
   if (email !== undefined && email !== null) toSend['email'] = email
   if (videoQuota !== undefined && videoQuota !== null) toSend['videoQuota'] = videoQuota
+  if (role !== undefined && role !== null) toSend['role'] = role
 
   return request(url)
           .put(path)