From efea4ff3ca4794ee60bfb4972d029da32e549923 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 22 Jan 2025 16:28:16 +0100 Subject: [PATCH] Update tests, remove too implementation-dependent assertions --- .../request-queue/request-queue-v2.test.ts | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/core/test/request-queue/request-queue-v2.test.ts b/packages/core/test/request-queue/request-queue-v2.test.ts index f311ac94dda3..d3b0affddea1 100644 --- a/packages/core/test/request-queue/request-queue-v2.test.ts +++ b/packages/core/test/request-queue/request-queue-v2.test.ts @@ -24,31 +24,27 @@ vitest.setConfig({ restoreMocks: false }); describe('RequestQueueV2#isFinished should use listHead instead of listAndLock', () => { let queue: RequestQueueV2; let clientListHeadSpy: MockInstance; - let listHeadCallCount = 0; - let clientListAndLockHeadSpy: MockInstance; - let listAndLockHeadCallCount = 0; - let lockResult: ListAndLockHeadResult; beforeAll(async () => { queue = await makeQueue('is-finished', 2); clientListHeadSpy = vitest.spyOn(queue.client, 'listHead'); - clientListAndLockHeadSpy = vitest.spyOn(queue.client, 'listAndLockHead'); }); test('should return false if there are still requests in the queue', async () => { expect(await queue.isFinished()).toBe(false); - expect(clientListHeadSpy).toHaveBeenCalledTimes(++listHeadCallCount); }); test('should return false even if all requests are locked', async () => { - lockResult = await queue.client.listAndLockHead({ lockSecs: 60 }); - - expect(lockResult.items.length).toBe(2); - expect(clientListAndLockHeadSpy).toHaveBeenCalledTimes(++listAndLockHeadCallCount); + queue.client.listAndLockHead = async (options) => ({ + lockSecs: options.lockSecs, + queueModifiedAt: new Date(), + limit: 10, + items: [], + queueHasLockedRequests: true, + }); expect(await queue.isFinished()).toBe(false); - expect(clientListHeadSpy).toHaveBeenCalledTimes(++listHeadCallCount); - expect(clientListAndLockHeadSpy).toHaveBeenCalledTimes(listAndLockHeadCallCount); + expect(clientListHeadSpy).not.toHaveBeenCalled(); }); }); @@ -81,7 +77,7 @@ describe('RequestQueueV2#isFinished should return true once locked requests are expect(clientListHeadSpy).toHaveBeenCalledWith({ limit: 2 }); expect(clientListHeadSpy).toHaveBeenCalledTimes(++listHeadCallCount); // One time - expect(clientListAndLockHeadSpy).toHaveBeenCalledTimes(1); + expect(clientListAndLockHeadSpy).toHaveBeenCalled(); }); });