Skip to content

Commit 057f19b

Browse files
committed
chore: wip
1 parent 10673cb commit 057f19b

9 files changed

Lines changed: 69 additions & 71 deletions

test/getters.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ describe('Jobs getters', () => {
333333
const data = { foo: 'sup!' }
334334
const job = await queue.add('test', data)
335335
const returnedJob = await queue.getJob(job.id!)
336-
expect(returnedJob!.data).to.eql(data)
336+
expect(returnedJob!.data).toEqual(data)
337337
expect(returnedJob!.id).toBe(job.id)
338338
})
339339

test/job.test.ts

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
/* eslint-env node */
2-
'use strict'
3-
41
import type { JobsOptions } from '../src/types'
5-
import { expect } from 'chai'
6-
import { default as IORedis } from 'ioredis'
2+
import IORedis from 'ioredis'
73
import { after } from 'lodash'
84
import {
9-
after as afterAll,
5+
expect,
6+
afterAll,
107
afterEach,
11-
before,
8+
beforeAll,
129
beforeEach,
1310
describe,
1411
it,
15-
} from 'mocha'
12+
} from 'bun:test'
1613
import { v4 } from 'uuid'
1714
import { Job, Queue, QueueEvents, Worker } from '../src/classes'
1815
import { delay, getParentKey, removeAllQueueData } from '../src/utils'
@@ -23,8 +20,9 @@ describe('Job', () => {
2320

2421
let queue: Queue
2522
let queueName: string
26-
let connection
27-
before(async () => {
23+
let connection: IORedis
24+
25+
beforeAll(async () => {
2826
connection = new IORedis(redisHost, { maxRetriesPerRequest: null })
2927
})
3028

@@ -62,7 +60,7 @@ describe('Job', () => {
6260
expect(storedJob).toHaveProperty('data')
6361

6462
expect(storedJob.data.foo).toBe('bar')
65-
expect(storedJob.opts).to.be.an('object')
63+
expect(storedJob.opts).toBeObject()
6664
expect(storedJob.opts.timestamp).toBe(timestamp)
6765
})
6866

@@ -87,7 +85,7 @@ describe('Job', () => {
8785
const data = { foo: 'bar' } // 13 bytes
8886
const opts = { sizeLimit: 20 }
8987
const createdJob = await Job.create(queue, 'test', data, opts)
90-
expect(createdJob).to.not.be.null
88+
expect(createdJob).not.toBeNull()
9189
expect(createdJob).toHaveProperty('opts')
9290
expect(createdJob.opts.sizeLimit).toBe(20)
9391
})
@@ -207,7 +205,7 @@ describe('Job', () => {
207205
job.progress = 20
208206
const json = JSON.stringify(job)
209207
const parsed = JSON.parse(json)
210-
expect(parsed).to.have.deep.property('data', data)
208+
expect(parsed).toHaveProperty('data', data)
211209
expect(parsed).toHaveProperty('name', 'test')
212210
expect(parsed).toHaveProperty('returnvalue', 1)
213211
expect(parsed).toHaveProperty('progress', 20)
@@ -226,7 +224,7 @@ describe('Job', () => {
226224
const job = await Job.create(queue, 'test', data)
227225
const json = JSON.stringify(job)
228226
const parsed = JSON.parse(json)
229-
expect(parsed).to.have.deep.property('data', data)
227+
expect(parsed).toHaveProperty('data', data)
230228

231229
const newQueue = new Queue(queueName, { connection, prefix })
232230
let worker: Worker
@@ -390,24 +388,24 @@ describe('Job', () => {
390388
const job = await Job.create(queue, 'test', { foo: 'bar' })
391389
await job.updateProgress({ total: 120, completed: 40 })
392390
const storedJob = await Job.fromId(queue, job.id!)
393-
expect(storedJob!.progress).to.eql({ total: 120, completed: 40 })
391+
expect(storedJob!.progress).toEqual({ total: 120, completed: 40 })
394392
})
395393

396394
it('can set and get progress as string', async () => {
397395
const job = await Job.create(queue, 'test', { foo: 'bar' })
398396
await job.updateProgress('hello, world!')
399397
const storedJob = await Job.fromId(queue, job.id!)
400-
expect(storedJob!.progress).to.eql('hello, world!')
398+
expect(storedJob!.progress).toEqual('hello, world!')
401399
})
402400

403401
it('can set and get progress as boolean', async () => {
404402
const job = await Job.create(queue, 'test', { foo: 'bar' })
405403
await job.updateProgress(false)
406404
let storedJob = await Job.fromId(queue, job.id!)
407-
expect(storedJob!.progress).to.eql(false)
405+
expect(storedJob!.progress).toEqual(false)
408406
await job.updateProgress(true)
409407
storedJob = await Job.fromId(queue, job.id!)
410-
expect(storedJob!.progress).to.eql(true)
408+
expect(storedJob!.progress).toEqual(true)
411409
})
412410

413411
it('can set progress as number using the Queue instance', async () => {
@@ -423,7 +421,7 @@ describe('Job', () => {
423421
const job = await Job.create(queue, 'test', { foo: 'bar' })
424422
await queue.updateJobProgress(job.id!, { total: 120, completed: 40 })
425423
const storedJob = await Job.fromId(queue, job.id!)
426-
expect(storedJob!.progress).to.eql({ total: 120, completed: 40 })
424+
expect(storedJob!.progress).toEqual({ total: 120, completed: 40 })
427425
})
428426

429427
describe('when job is removed', () => {
@@ -696,7 +694,7 @@ describe('Job', () => {
696694

697695
const isCompleted = await job.isCompleted()
698696

699-
expect(isCompleted).to.be.false
697+
expect(isCompleted).toBeFalse()
700698

701699
await childrenWorker.close()
702700
await parentWorker.close()
@@ -716,7 +714,7 @@ describe('Job', () => {
716714
await job.moveToFailed(new Error('test error'), '0', true)
717715
const isFailed2 = await job.isFailed()
718716
expect(isFailed2).toBe(true)
719-
expect(job.stacktrace).not.be.equal(null)
717+
expect(job.stacktrace).not.toEqual(null)
720718
expect(job.stacktrace.length).toBe(1)
721719
expect(job.stacktrace[0]).toInclude('test_job.ts')
722720
await worker.close()
@@ -734,7 +732,7 @@ describe('Job', () => {
734732
await job.moveToFailed(new CustomError('test error'), '0', true)
735733
const isFailed2 = await job.isFailed()
736734
expect(isFailed2).toBe(true)
737-
expect(job.stacktrace).not.be.equal(null)
735+
expect(job.stacktrace).not.toEqual(null)
738736
expect(job.stacktrace.length).toBe(1)
739737
expect(job.stacktrace[0]).toInclude('test_job.ts')
740738
await worker.close()
@@ -763,7 +761,7 @@ describe('Job', () => {
763761

764762
const isFailed2 = await job.isFailed()
765763
expect(isFailed2).toBe(false)
766-
expect(job.stacktrace).not.be.equal(null)
764+
expect(job.stacktrace).not.toEqual(null)
767765
expect(job.stacktrace.length).toBe(1)
768766
const isWaiting = await job.isWaiting()
769767
expect(isWaiting).toBe(true)
@@ -841,7 +839,7 @@ describe('Job', () => {
841839

842840
expect(isFailed2).toBe(true)
843841
expect(state).toBe('failed')
844-
expect(job.stacktrace).not.be.equal(null)
842+
expect(job.stacktrace).not.toEqual(null)
845843
expect(job.stacktrace.length).toBe(1)
846844
await worker.close()
847845
})
@@ -867,7 +865,7 @@ describe('Job', () => {
867865
const isFailed2 = await job.isFailed()
868866

869867
expect(isFailed2).toBe(false)
870-
expect(job.stacktrace).not.be.equal(null)
868+
expect(job.stacktrace).not.toEqual(null)
871869
expect(job.stacktrace.length).toBe(1)
872870
const isDelayed = await job.isDelayed()
873871
expect(isDelayed).toBe(true)
@@ -893,8 +891,8 @@ describe('Job', () => {
893891
await job.moveToFailed(new Error('failed once'), '0', true)
894892
const isFailed1 = await job.isFailed()
895893
const stackTrace1 = job.stacktrace[0]
896-
expect(isFailed1).to.be.false
897-
expect(job.stacktrace).not.be.equal(null)
894+
expect(isFailed1).toBeFalse()
895+
expect(job.stacktrace).not.toEqual(null)
898896
expect(job.stacktrace.length).toBe(stackTraceLimit)
899897
// second time failed.
900898
const again = (await worker.getNextJob(token)) as Job
@@ -904,7 +902,7 @@ describe('Job', () => {
904902
expect(isFailed2).toBeTrue()
905903
expect(again.name).toBe(job.name)
906904
expect(again.stacktrace.length).toBe(stackTraceLimit)
907-
expect(stackTrace1).not.be.equal(stackTrace2)
905+
expect(stackTrace1).not.toEqual(stackTrace2)
908906
await worker.close()
909907
})
910908

@@ -925,7 +923,7 @@ describe('Job', () => {
925923
// first time failed.
926924
await job.moveToFailed(new Error('failed once'), '0', true)
927925
const isFailed1 = await job.isFailed()
928-
expect(isFailed1).to.be.false
926+
expect(isFailed1).toBeFalse()
929927
expect(job.stacktrace.length).toBe(stackTraceLimit)
930928
// second time failed.
931929
const again = (await worker.getNextJob(token)) as Job
@@ -947,7 +945,7 @@ describe('Job', () => {
947945
await job.moveToFailed(new Error('test error'), '0')
948946
const sameJob = await queue.getJob(id!)
949947
expect(sameJob).toBeTruthy()
950-
expect(sameJob.stacktrace).to.be.not.empty
948+
expect(sameJob.stacktrace).not.toBeEmpty()
951949
await worker.close()
952950
})
953951
})
@@ -1770,7 +1768,7 @@ describe('Job', () => {
17701768

17711769
const result = await job.waitUntilFinished(queueEvents)
17721770

1773-
expect(result).to.be.an('object')
1771+
expect(result).toBeObject()
17741772
expect(result.resultFoo).equal('bar')
17751773

17761774
await worker.close()
@@ -1790,7 +1788,7 @@ describe('Job', () => {
17901788
await delay(600)
17911789

17921790
const result = await job.waitUntilFinished(queueEvents)
1793-
expect(result).to.be.an('object')
1791+
expect(result).toBeObject()
17941792
expect(result.resultFoo).equal('bar')
17951793

17961794
await worker.close()
@@ -1842,7 +1840,7 @@ describe('Job', () => {
18421840
await delay(500)
18431841
const result = await job.waitUntilFinished(queueEvents)
18441842

1845-
expect(result).to.be.an('object')
1843+
expect(result).toBeObject()
18461844
expect(result.resultFoo).equal('bar')
18471845

18481846
await worker.close()

test/job_scheduler.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,7 +1906,7 @@ describe('Job Scheduler', function () {
19061906
const removed = await queue.removeJobScheduler(repeatableJobs[0].key)
19071907
expect(removed).toBeTrue()
19081908
const removed2 = await queue.removeJobScheduler(repeatableJobs[0].key)
1909-
expect(removed2).to.be.false
1909+
expect(removed2).toBeFalse()
19101910
})
19111911
})
19121912

@@ -2365,7 +2365,7 @@ describe('Job Scheduler', function () {
23652365

23662366
const jobs = await queue.getRepeatableJobs()
23672367
// Repeatable job was recreated
2368-
expect(jobs.length).to.eql(0)
2368+
expect(jobs.length).toEqual(0)
23692369

23702370
await worker!.close()
23712371
})

test/pause.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ describe('Pause', () => {
333333

334334
await queue.resume()
335335
const isResumedQueuePaused = await queue.isPaused()
336-
expect(isResumedQueuePaused).to.be.false
336+
expect(isResumedQueuePaused).toBeFalse()
337337
})
338338

339339
it('should pause and resume worker without error', async () => {

test/rate_limiter.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ describe('Rate Limiter', () => {
807807
await delay(dynamicLimit / 2)
808808

809809
const jobs = await queue.getJobs(['prioritized'], 0, -1, true)
810-
expect(jobs.map(x => x.name)).to.eql(['1', '2', '3', '4'])
810+
expect(jobs.map(x => x.name)).toEqual(['1', '2', '3', '4'])
811811

812812
await worker.close()
813813
})
@@ -844,7 +844,7 @@ describe('Rate Limiter', () => {
844844
await delay(dynamicLimit * 4)
845845

846846
const jobs = await queue.getJobs(['prioritized'], 0, -1, true)
847-
expect(jobs.map(x => x.name)).to.eql(['1', '3', '2', '4'])
847+
expect(jobs.map(x => x.name)).toEqual(['1', '3', '2', '4'])
848848

849849
await worker.close()
850850
})

test/repeat.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ describe('repeat', function () {
14971497
const removed = await queue.removeRepeatableByKey(repeatableJobs[0].key)
14981498
expect(removed).toBeTrue()
14991499
const removed2 = await queue.removeRepeatableByKey(repeatableJobs[0].key)
1500-
expect(removed2).to.be.false
1500+
expect(removed2).toBeFalse()
15011501
})
15021502
})
15031503

@@ -1752,7 +1752,7 @@ describe('repeat', function () {
17521752

17531753
const jobs = await queue.getRepeatableJobs()
17541754
// Repeatable job was recreated
1755-
expect(jobs.length).to.eql(0)
1755+
expect(jobs.length).toEqual(0)
17561756

17571757
await worker!.close()
17581758
})

test/sandboxed_process.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ function sandboxProcessTests(
608608

609609
const completing = new Promise<void>((resolve, reject) => {
610610
const after4 = after(4, () => {
611-
expect(worker.childPool.getAllFree().length).to.eql(4)
611+
expect(worker.childPool.getAllFree().length).toEqual(4)
612612
resolve()
613613
})
614614

@@ -618,7 +618,7 @@ function sandboxProcessTests(
618618
expect(
619619
Object.keys(worker.childPool.retained).length
620620
+ worker.childPool.getAllFree().length,
621-
).to.eql(4)
621+
).toEqual(4)
622622
after4()
623623
}
624624
catch (err) {
@@ -652,7 +652,7 @@ function sandboxProcessTests(
652652

653653
const completing = new Promise<void>((resolve, reject) => {
654654
const after4 = after(4, async () => {
655-
expect(worker.childPool.getAllFree().length).to.eql(1)
655+
expect(worker.childPool.getAllFree().length).toEqual(1)
656656
resolve()
657657
})
658658

@@ -662,7 +662,7 @@ function sandboxProcessTests(
662662
expect(
663663
Object.keys(worker.childPool.retained).length
664664
+ worker.childPool.getAllFree().length,
665-
).to.eql(1)
665+
).toEqual(1)
666666
await after4()
667667
}
668668
catch (err) {
@@ -1524,7 +1524,7 @@ function sandboxProcessTests(
15241524
await worker.close()
15251525

15261526
// ensure the child did get cleaned up
1527-
expect(!!child.killed).to.eql(true)
1527+
expect(!!child.killed).toEqual(true)
15281528
expect(Object.keys(worker.childPool.retained)).toHaveLength(0)
15291529
expect(worker.childPool.getAllFree()).toHaveLength(0)
15301530

0 commit comments

Comments
 (0)