X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fjobs.ts;h=52948b1d64164dfef47f84c2e5204bc35276724f;hb=88108880bbdba473cfe36ecbebc1c3c4f972e102;hp=b2922c5da73d1ba25212f03e5e0c67575b5fe3a1;hpb=04291e1ba44032165388758e993d385a10c1c5a1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts index b2922c5da..52948b1d6 100644 --- a/server/tests/api/server/jobs.ts +++ b/server/tests/api/server/jobs.ts @@ -2,12 +2,12 @@ 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 { killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../../../shared/utils/server/jobs' +import { flushAndRunMultipleServers } from '../../../../shared/utils/server/servers' +import { uploadVideo } from '../../../../shared/utils/videos/videos' +import { dateIsValid } from '../../../../shared/utils/miscs/miscs' const expect = chai.expect @@ -41,11 +41,13 @@ describe('Test jobs', function () { }) it('Should list jobs with sort and pagination', async function () { - const res = await getJobsListPaginationAndSort(servers[1].url, servers[1].accessToken, 'completed', 1, 1, 'createdAt') + 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(1) + expect(res.body.data).to.have.lengthOf(2) - const job = res.body.data[0] + let 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).to.equal('activitypub-follow')