refactor(retry): simplify error handling in retry tests and ensure consistent promise rejection handling

This commit is contained in:
2026-03-26 06:28:09 +07:00
parent ed5e6656f1
commit 6b4ddc9733
2 changed files with 19 additions and 16 deletions
+6 -3
View File
@@ -99,6 +99,7 @@ describe('retry', () => {
const failingFn = vi.fn().mockRejectedValue(new Error('Test error')); const failingFn = vi.fn().mockRejectedValue(new Error('Test error'));
const retryPromise = retry(failingFn, { times: 3, delay: 1000 }); const retryPromise = retry(failingFn, { times: 3, delay: 1000 });
const result = expect(retryPromise).rejects.toThrow('Test error');
// First call should happen immediately // First call should happen immediately
expect(failingFn).toHaveBeenCalledTimes(1); expect(failingFn).toHaveBeenCalledTimes(1);
@@ -111,7 +112,7 @@ describe('retry', () => {
await vi.advanceTimersByTimeAsync(1000); await vi.advanceTimersByTimeAsync(1000);
expect(failingFn).toHaveBeenCalledTimes(3); expect(failingFn).toHaveBeenCalledTimes(3);
await expect(retryPromise).rejects.toThrow('Test error'); await result;
}); });
it('use dynamic delay function', async () => { it('use dynamic delay function', async () => {
@@ -119,6 +120,7 @@ describe('retry', () => {
const delayFn = vi.fn((count: number) => count * 500); const delayFn = vi.fn((count: number) => count * 500);
const retryPromise = retry(failingFn, { times: 3, delay: delayFn }); const retryPromise = retry(failingFn, { times: 3, delay: delayFn });
const result = expect(retryPromise).rejects.toThrow('Test error');
// First call should happen immediately // First call should happen immediately
expect(failingFn).toHaveBeenCalledTimes(1); expect(failingFn).toHaveBeenCalledTimes(1);
@@ -133,19 +135,20 @@ describe('retry', () => {
expect(failingFn).toHaveBeenCalledTimes(3); expect(failingFn).toHaveBeenCalledTimes(3);
expect(delayFn).toHaveBeenCalledWith(3); expect(delayFn).toHaveBeenCalledWith(3);
await expect(retryPromise).rejects.toThrow('Test error'); await result;
}); });
it('not delay after the last attempt', async () => { it('not delay after the last attempt', async () => {
const failingFn = vi.fn().mockRejectedValue(new Error('Test error')); const failingFn = vi.fn().mockRejectedValue(new Error('Test error'));
const retryPromise = retry(failingFn, { times: 2, delay: 1000 }); const retryPromise = retry(failingFn, { times: 2, delay: 1000 });
const result = expect(retryPromise).rejects.toThrow('Test error');
// Wait for the first retry delay // Wait for the first retry delay
await vi.advanceTimersByTimeAsync(1000); await vi.advanceTimersByTimeAsync(1000);
// Should complete without further delays // Should complete without further delays
await expect(retryPromise).rejects.toThrow('Test error'); await result;
expect(failingFn).toHaveBeenCalledTimes(2); expect(failingFn).toHaveBeenCalledTimes(2);
}); });
+1 -1
View File
@@ -32,7 +32,7 @@ export function tryIt<Args extends any[], Return>(
const result = fn(...args); const result = fn(...args);
if (isPromise(result)) if (isPromise(result))
return result.then(onResolve).catch(onReject) as TryItReturn<Return>; return result.then(onResolve, onReject) as TryItReturn<Return>;
return { error: undefined, data: result } as TryItReturn<Return>; return { error: undefined, data: result } as TryItReturn<Return>;
} catch (error) { } catch (error) {