require -> import

[github/Chocobozzz/PeerTube.git] / server / tests / api / requests.js

diff --git a/server/tests/api/requests.js b/server/tests/api/requests.js
index af36f6e349b540275858cbf0cbfd35c5251cbf89..8762163af508d6b60ae010db2c8e45b26864a2e7 100644 (file)
--- a/server/tests/api/requests.js
+++ b/server/tests/api/requests.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-expressions */
+
 'use strict'
 
 const chai = require('chai')
@@ -11,16 +13,16 @@ const serversUtils = require('../utils/servers')
 const videosUtils = require('../utils/videos')
 
 describe('Test requests stats', function () {
+  const requestSchedulerNames = [ 'requestScheduler', 'requestVideoQaduScheduler', 'requestVideoEventScheduler' ]
   const path = '/api/v1/requests/stats'
   let servers = []
 
   function uploadVideo (server, callback) {
-    const name = 'my super video'
-    const description = 'my super description'
-    const tags = [ 'tag1', 'tag2' ]
-    const fixture = 'video_short.webm'
+    const videoAttributes = {
+      tags: [ 'tag1', 'tag2' ]
+    }
 
-    videosUtils.uploadVideo(server.url, server.accessToken, name, description, tags, fixture, callback)
+    videosUtils.uploadVideo(server.url, server.accessToken, videoAttributes, callback)
   }
 
   function getRequestsStats (server, callback) {
@@ -61,15 +63,19 @@ describe('Test requests stats', function () {
     getRequestsStats(server, function (err, res) {
       if (err) throw err
 
-      const body = res.body
-      expect(body.remainingMilliSeconds).to.be.at.least(0)
-      expect(body.remainingMilliSeconds).to.be.at.most(10000)
+      const requestSchedulers = res.body
+      for (const requestSchedulerName of requestSchedulerNames) {
+        const requestScheduler = requestSchedulers[requestSchedulerName]
+
+        expect(requestScheduler.remainingMilliSeconds).to.be.at.least(0)
+        expect(requestScheduler.remainingMilliSeconds).to.be.at.most(10000)
+      }
 
       done()
     })
   })
 
-  it('Should have the correct request', function (done) {
+  it('Should have the correct total request', function (done) {
     this.timeout(15000)
 
     const server = servers[0]
@@ -79,40 +85,17 @@ describe('Test requests stats', function () {
     uploadVideo(server, function (err) {
       if (err) throw err
 
-      getRequestsStats(server, function (err, res) {
-        if (err) throw err
-
-        const body = res.body
-        expect(body.requests).to.have.lengthOf(1)
-
-        const request = body.requests[0]
-        expect(request.to).to.have.lengthOf(1)
-        expect(request.request.type).to.equal('add')
-
-        // Wait one cycle
-        setTimeout(done, 10000)
-      })
-    })
-  })
-
-  it('Should have the correct requests', function (done) {
-    const server = servers[0]
-
-    uploadVideo(server, function (err) {
-      if (err) throw err
-
-      getRequestsStats(server, function (err, res) {
-        if (err) throw err
-
-        const body = res.body
-        expect(body.requests).to.have.lengthOf(2)
+      setTimeout(function () {
+        getRequestsStats(server, function (err, res) {
+          if (err) throw err
 
-        const request = body.requests[1]
-        expect(request.to).to.have.lengthOf(1)
-        expect(request.request.type).to.equal('add')
+          const requestSchedulers = res.body
+          const requestScheduler = requestSchedulers.requestScheduler
+          expect(requestScheduler.totalRequests).to.equal(1)
 
-        done()
-      })
+          done()
+        })
+      }, 1000)
     })
   })