2 files changed, 56 insertions, 3 deletions

diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index b26dfa252..ecfb76d47 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -48,7 +48,8 @@ describe('Test config API validators', function () {
       email: 'superadmin1@example.com'
     },
     user: {
-      videoQuota: 5242881
+      videoQuota: 5242881,
+      videoQuotaDaily: 318742
     },
     transcoding: {
       enabled: true,
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index b3fb61f6c..8b2ed1b04 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -94,6 +94,7 @@ describe('Test users API validators', function () {
       email: 'test@example.com',
       password: 'my super password',
       videoQuota: -1,
+      videoQuotaDaily: -1,
       role: UserRole.USER
     }
 
@@ -173,12 +174,24 @@ describe('Test users API validators', function () {
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
+    it('Should fail without a videoQuotaDaily', async function () {
+      const fields = omit(baseCorrectParams, 'videoQuotaDaily')
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
     it('Should fail with an invalid videoQuota', async function () {
       const fields = immutableAssign(baseCorrectParams, { videoQuota: -5 })
 
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
+    it('Should fail with an invalid videoQuotaDaily', async function () {
+      const fields = immutableAssign(baseCorrectParams, { videoQuotaDaily: -7 })
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
     it('Should fail without a user role', async function () {
       const fields = omit(baseCorrectParams, 'role')
 
@@ -607,7 +620,7 @@ describe('Test users API validators', function () {
   })
 
   describe('When having a video quota', function () {
-    it('Should fail with a user having too many video', async function () {
+    it('Should fail with a user having too many videos', async function () {
       await updateUser({
         url: server.url,
         userId: rootId,
@@ -618,7 +631,7 @@ describe('Test users API validators', function () {
       await uploadVideo(server.url, server.accessToken, {}, 403)
     })
 
-    it('Should fail with a registered user having too many video', async function () {
+    it('Should fail with a registered user having too many videos', async function () {
       this.timeout(30000)
 
       const user = {
@@ -663,6 +676,45 @@ describe('Test users API validators', function () {
     })
   })
 
+  describe('When having a daily video quota', function () {
+    it('Should fail with a user having too many videos', async function () {
+      await updateUser({
+        url: server.url,
+        userId: rootId,
+        accessToken: server.accessToken,
+        videoQuotaDaily: 42
+      })
+
+      await uploadVideo(server.url, server.accessToken, {}, 403)
+    })
+  })
+
+  describe('When having an absolute and daily video quota', function () {
+    it('Should fail if exceeding total quota', async function () {
+      await updateUser({
+        url: server.url,
+        userId: rootId,
+        accessToken: server.accessToken,
+        videoQuota: 42,
+        videoQuotaDaily: 1024 * 1024 * 1024
+      })
+
+      await uploadVideo(server.url, server.accessToken, {}, 403)
+    })
+
+    it('Should fail if exceeding daily quota', async function () {
+      await updateUser({
+        url: server.url,
+        userId: rootId,
+        accessToken: server.accessToken,
+        videoQuota: 1024 * 1024 * 1024,
+        videoQuotaDaily: 42
+      })
+
+      await uploadVideo(server.url, server.accessToken, {}, 403)
+    })
+  })
+
   describe('When asking a password reset', function () {
     const path = '/api/v1/users/ask-reset-password'