-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import * as chai from 'chai'
import 'mocha'
-import { killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index'
-import { doubleFollow } from '../../utils/server/follows'
-import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../utils/server/jobs'
-import { flushAndRunMultipleServers } from '../../utils/server/servers'
-import { uploadVideo } from '../../utils/videos/videos'
-import { dateIsValid } from '../../utils/miscs/miscs'
+import { cleanupTests, 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 { Job } from '../../../../shared/models/server'
const expect = chai.expect
})
it('Should create some jobs', async function () {
- this.timeout(30000)
+ this.timeout(60000)
await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video1' })
await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video2' })
expect(res.body.data).to.have.length.above(2)
})
- 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 jobs with sort, pagination and job type', async function () {
+ {
+ const res = await getJobsListPaginationAndSort({
+ url: servers[1].url,
+ accessToken: servers[1].accessToken,
+ state: 'completed',
+ start: 1,
+ count: 2,
+ sort: 'createdAt'
+ })
+ expect(res.body.total).to.be.above(2)
+ expect(res.body.data).to.have.lengthOf(2)
+
+ let job: Job = res.body.data[0]
+ // Skip repeat jobs
+ if (job.type === 'videos-views') job = res.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
+ }
- let job = res.body.data[0]
- // Skip repeat jobs
- if (job.type === 'videos-views') job = res.body.data[1]
+ {
+ const res = await getJobsListPaginationAndSort({
+ url: servers[1].url,
+ accessToken: servers[1].accessToken,
+ state: 'completed',
+ start: 0,
+ count: 100,
+ sort: 'createdAt',
+ jobType: 'activitypub-http-broadcast'
+ })
+ expect(res.body.total).to.be.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
+ for (const j of res.body.data as Job[]) {
+ expect(j.type).to.equal('activitypub-http-broadcast')
+ }
+ }
})
after(async function () {
- killallServers(servers)
+ await cleanupTests(servers)
})
})