X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fjobs.ts;h=aa4c7587b4ff4e1140f7aa4c5fee264f88bfb1bd;hb=d23dd9fbfc4d26026352c10f81d2795ceaf2908a;hp=3ab2fe1202aca5bff739fa7058113c9c5c482a77;hpb=b345a8047bfde1efa1fdbd249f25f663151265a8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index 3ab2fe120..aa4c7587b 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -1,13 +1,16 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { cleanupTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
-import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
-import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { flushAndRunMultipleServers } from '../../../../shared/extra-utils/server/servers'
-import { uploadVideo } from '../../../../shared/extra-utils/videos/videos'
-import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs'
+import * as chai from 'chai'
+import {
+  cleanupTests,
+  dateIsValid,
+  doubleFollow,
+  flushAndRunMultipleServers,
+  ServerInfo,
+  setAccessTokensToServers,
+  waitJobs
+} from '@shared/extra-utils'
 
 const expect = chai.expect
 
@@ -26,34 +29,68 @@ describe('Test jobs', function () {
   })
 
   it('Should create some jobs', async function () {
-    this.timeout(60000)
+    this.timeout(120000)
 
-    await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video1' })
-    await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video2' })
+    await servers[1].videosCommand.upload({ attributes: { name: 'video1' } })
+    await servers[1].videosCommand.upload({ attributes: { name: 'video2' } })
 
     await waitJobs(servers)
   })
 
   it('Should list jobs', async function () {
-    const res = await getJobsList(servers[1].url, servers[1].accessToken, 'completed')
-    expect(res.body.total).to.be.above(2)
-    expect(res.body.data).to.have.length.above(2)
+    const body = await servers[1].jobsCommand.getJobsList({ state: 'completed' })
+    expect(body.total).to.be.above(2)
+    expect(body.data).to.have.length.above(2)
+  })
+
+  it('Should list jobs with sort, pagination and job type', async function () {
+    {
+      const body = await servers[1].jobsCommand.getJobsList({
+        state: 'completed',
+        start: 1,
+        count: 2,
+        sort: 'createdAt'
+      })
+      expect(body.total).to.be.above(2)
+      expect(body.data).to.have.lengthOf(2)
+
+      let job = body.data[0]
+      // Skip repeat jobs
+      if (job.type === 'videos-views') job = body.data[1]
+
+      expect(job.state).to.equal('completed')
+      expect(job.type.startsWith('activitypub-')).to.be.true
+      expect(dateIsValid(job.createdAt as string)).to.be.true
+      expect(dateIsValid(job.processedOn as string)).to.be.true
+      expect(dateIsValid(job.finishedOn as string)).to.be.true
+    }
+
+    {
+      const body = await servers[1].jobsCommand.getJobsList({
+        state: 'completed',
+        start: 0,
+        count: 100,
+        sort: 'createdAt',
+        jobType: 'activitypub-http-broadcast'
+      })
+      expect(body.total).to.be.above(2)
+
+      for (const j of body.data) {
+        expect(j.type).to.equal('activitypub-http-broadcast')
+      }
+    }
   })
 
-  it('Should list jobs with sort and pagination', async function () {
-    const res = await getJobsListPaginationAndSort(servers[1].url, servers[1].accessToken, 'completed', 1, 2, 'createdAt')
-    expect(res.body.total).to.be.above(2)
-    expect(res.body.data).to.have.lengthOf(2)
+  it('Should list all jobs', async function () {
+    const body = await servers[1].jobsCommand.getJobsList()
+    expect(body.total).to.be.above(2)
 
-    let job = res.body.data[0]
-    // Skip repeat jobs
-    if (job.type === 'videos-views') job = res.body.data[1]
+    const jobs = body.data
+    expect(jobs).to.have.length.above(2)
 
-    expect(job.state).to.equal('completed')
-    expect(job.type).to.equal('activitypub-follow')
-    expect(dateIsValid(job.createdAt)).to.be.true
-    expect(dateIsValid(job.processedOn)).to.be.true
-    expect(dateIsValid(job.finishedOn)).to.be.true
+    // We know there are a least 1 delayed job (video views) and 1 completed job (broadcast)
+    expect(jobs.find(j => j.state === 'delayed')).to.not.be.undefined
+    expect(jobs.find(j => j.state === 'completed')).to.not.be.undefined
   })
 
   after(async function () {