chore: 4rd attempt to fix tests

taskforcesh · Dec 4, 2024 · aee5ded · aee5ded
1 parent 7687688
commit aee5ded
Showing 1 changed file with 40 additions and 47 deletions.
diff --git a/tests/test_job_scheduler.ts b/tests/test_job_scheduler.ts
@@ -126,13 +126,11 @@ describe('Job Scheduler', function () {
     const every = 100;
     const date = new Date('2017-02-07 9:24:00');
     this.clock.setSystemTime(date);
-    const worker = new Worker(
-      queueName,
-      async () => {
-        this.clock.tick(every);
-      },
-      { autorun: false, connection, prefix },
-    );
+    const worker = new Worker(queueName, async () => {}, {
+      autorun: false,
+      connection,
+      prefix,
+    });
     const delayStub = sinon.stub(worker, 'delay').callsFake(async () => {});
     await worker.waitUntilReady();
 
@@ -143,6 +141,7 @@ describe('Job Scheduler', function () {
         if (processed === 10) {
           resolve();
         }
+        this.clock.tick(every);
       });
     });
 
@@ -333,13 +332,11 @@ describe('Job Scheduler', function () {
 
     const nextTick = 2 * ONE_SECOND + 100;
 
-    const worker = new Worker(
-      queueName,
-      async () => {
-        this.clock.tick(nextTick);
-      },
-      { autorun: false, connection, prefix },
-    );
+    const worker = new Worker(queueName, async () => {}, {
+      autorun: false,
+      connection,
+      prefix,
+    });
     const delayStub = sinon.stub(worker, 'delay').callsFake(async () => {});
 
     const date = new Date('2017-02-07 9:24:00');
@@ -383,6 +380,7 @@ describe('Job Scheduler', function () {
         if (counter == 5) {
           resolve();
         }
+        this.clock.tick(nextTick);
       });
     });
 
@@ -401,13 +399,11 @@ describe('Job Scheduler', function () {
     const nextTick = 2 * ONE_SECOND + 500;
     const delay = 5 * ONE_SECOND + 500;
 
-    const worker = new Worker(
-      queueName,
-      async () => {
-        this.clock.tick(nextTick);
-      },
-      { autorun: false, connection, prefix },
-    );
+    const worker = new Worker(queueName, async () => {}, {
+      autorun: false,
+      connection,
+      prefix,
+    });
     const delayStub = sinon.stub(worker, 'delay').callsFake(async () => {});
 
     await queue.upsertJobScheduler(
@@ -435,6 +431,7 @@ describe('Job Scheduler', function () {
         if (counter == 5) {
           resolve();
         }
+        this.clock.tick(nextTick);
       });
     });
 
@@ -454,13 +451,11 @@ describe('Job Scheduler', function () {
     const nextTick = 2 * ONE_SECOND + 500;
     const delay = 5 * ONE_SECOND + 500;
 
-    const worker = new Worker(
-      queueName,
-      async () => {
-        this.clock.tick(nextTick);
-      },
-      { autorun: false, connection, prefix },
-    );
+    const worker = new Worker(queueName, async () => {}, {
+      autorun: false,
+      connection,
+      prefix,
+    });
     const delayStub = sinon.stub(worker, 'delay').callsFake(async () => {});
 
     await queue.upsertJobScheduler(
@@ -488,6 +483,7 @@ describe('Job Scheduler', function () {
         if (counter == 5) {
           resolve();
         }
+        this.clock.tick(nextTick);
       });
     });
 
@@ -515,16 +511,14 @@ describe('Job Scheduler', function () {
       const nextTick = 2 * ONE_SECOND + 500;
       const delay = 5 * ONE_SECOND + 500;
 
-      const worker = new Worker(
-        queueName,
-        async () => {
-          this.clock.tick(nextTick);
-        },
-        { autorun: false, connection, prefix },
-      );
+      const worker = new Worker(queueName2, async () => {}, {
+        autorun: false,
+        connection,
+        prefix,
+      });
       const delayStub = sinon.stub(worker, 'delay').callsFake(async () => {});
 
-      await queue.upsertJobScheduler(
+      await queue2.upsertJobScheduler(
         'test',
         {
           pattern: '*/2 * * * * *',
@@ -551,6 +545,7 @@ describe('Job Scheduler', function () {
             expect(counts.completed).to.be.equal(0);
             resolve();
           }
+          this.clock.tick(nextTick);
         });
       });
 
@@ -776,13 +771,10 @@ describe('Job Scheduler', function () {
     this.clock.setSystemTime(date);
     const nextTick = 2 * ONE_SECOND;
 
-    const worker = new Worker(
-      queueName,
-      async () => {
-        this.clock.tick(nextTick);
-      },
-      { connection, prefix },
-    );
+    const worker = new Worker(queueName, async () => {}, {
+      connection,
+      prefix,
+    });
 
     let prev: Job;
     let counter = 0;
@@ -802,6 +794,7 @@ describe('Job Scheduler', function () {
           if (counter === 5) {
             resolve();
           }
+          this.clock.tick(nextTick);
         } catch (err) {
           reject(err);
         }
@@ -831,8 +824,6 @@ describe('Job Scheduler', function () {
       worker = new Worker(
         queueName,
         async (job: Job) => {
-          this.clock.tick(nextTick);
-
           try {
             expect(job.opts.delay).to.be.eq(0);
             resolve();
@@ -859,14 +850,14 @@ describe('Job Scheduler', function () {
 
     await worker!.close();
 
+    this.clock.tick(nextTick);
+
     await queue.removeJobScheduler('repeat');
 
     const processing2 = new Promise<void>((resolve, reject) => {
       worker = new Worker(
         queueName,
         async (job: Job) => {
-          this.clock.tick(nextTick);
-
           try {
             expect(job.opts.delay).to.be.eq(0);
             resolve();
@@ -889,6 +880,8 @@ describe('Job Scheduler', function () {
 
     await processing2;
 
+    this.clock.tick(nextTick);
+
     await worker!.close();
   });