diff --git a/packages/abort-controller/src/AbortSignal.spec.ts b/packages/abort-controller/src/AbortSignal.spec.ts index cbfb7610014..5575dffa74c 100644 --- a/packages/abort-controller/src/AbortSignal.spec.ts +++ b/packages/abort-controller/src/AbortSignal.spec.ts @@ -13,7 +13,7 @@ describe("AbortSignal", () => { it("should invoke the onabort handler when the signal is aborted", () => { const controller = new AbortController(); const { signal } = controller; - const abortHandler = jest.fn(); + const abortHandler = vi.fn(); signal.onabort = abortHandler; expect(abortHandler.mock.calls.length).toBe(0); controller.abort(); @@ -23,7 +23,7 @@ describe("AbortSignal", () => { it("should not invoke the onabort handler multiple time", () => { const controller = new AbortController(); const { signal } = controller; - const abortHandler = jest.fn(); + const abortHandler = vi.fn(); signal.onabort = abortHandler; expect(abortHandler.mock.calls.length).toBe(0); controller.abort(); diff --git a/packages/config-resolver/src/endpointsConfig/resolveCustomEndpointsConfig.spec.ts b/packages/config-resolver/src/endpointsConfig/resolveCustomEndpointsConfig.spec.ts index c78960d4047..b7008374680 100644 --- a/packages/config-resolver/src/endpointsConfig/resolveCustomEndpointsConfig.spec.ts +++ b/packages/config-resolver/src/endpointsConfig/resolveCustomEndpointsConfig.spec.ts @@ -13,7 +13,7 @@ describe(resolveCustomEndpointsConfig.name, () => { const mockInput = { endpoint: mockEndpoint, - urlParser: jest.fn(() => mockEndpoint), + urlParser: vi.fn(() => mockEndpoint), useDualstackEndpoint: () => Promise.resolve(false), } as any; diff --git a/packages/config-resolver/src/endpointsConfig/resolveEndpointsConfig.spec.ts b/packages/config-resolver/src/endpointsConfig/resolveEndpointsConfig.spec.ts index cc8605fbd4e..896ea7ebe74 100644 --- a/packages/config-resolver/src/endpointsConfig/resolveEndpointsConfig.spec.ts +++ b/packages/config-resolver/src/endpointsConfig/resolveEndpointsConfig.spec.ts @@ -16,7 +16,7 @@ describe(resolveEndpointsConfig.name, () => { const mockInput = { endpoint: mockEndpoint, - urlParser: jest.fn(() => mockEndpoint), + urlParser: vi.fn(() => mockEndpoint), useDualstackEndpoint: () => Promise.resolve(false), useFipsEndpoint: () => Promise.resolve(false), } as any; diff --git a/packages/config-resolver/src/endpointsConfig/utils/getEndpointFromRegion.spec.ts b/packages/config-resolver/src/endpointsConfig/utils/getEndpointFromRegion.spec.ts index 7e40182a21a..2a635ea9f4e 100644 --- a/packages/config-resolver/src/endpointsConfig/utils/getEndpointFromRegion.spec.ts +++ b/packages/config-resolver/src/endpointsConfig/utils/getEndpointFromRegion.spec.ts @@ -1,11 +1,11 @@ import { getEndpointFromRegion } from "./getEndpointFromRegion"; describe(getEndpointFromRegion.name, () => { - const mockRegion = jest.fn(); - const mockUrlParser = jest.fn(); - const mockRegionInfoProvider = jest.fn(); - const mockUseFipsEndpoint = jest.fn(); - const mockUseDualstackEndpoint = jest.fn(); + const mockRegion = vi.fn(); + const mockUrlParser = vi.fn(); + const mockRegionInfoProvider = vi.fn(); + const mockUseFipsEndpoint = vi.fn(); + const mockUseDualstackEndpoint = vi.fn(); const mockInput = { region: mockRegion, diff --git a/packages/config-resolver/src/regionConfig/resolveRegionConfig.spec.ts b/packages/config-resolver/src/regionConfig/resolveRegionConfig.spec.ts index cd01e207779..57560652a98 100644 --- a/packages/config-resolver/src/regionConfig/resolveRegionConfig.spec.ts +++ b/packages/config-resolver/src/regionConfig/resolveRegionConfig.spec.ts @@ -49,8 +49,8 @@ describe("RegionConfig", () => { let mockUseFipsEndpoint; beforeEach(() => { - mockRegionProvider = jest.fn().mockResolvedValueOnce(Promise.resolve(mockRegion)); - mockUseFipsEndpoint = jest.fn().mockResolvedValueOnce(Promise.resolve(false)); + mockRegionProvider = vi.fn().mockResolvedValueOnce(Promise.resolve(mockRegion)); + mockUseFipsEndpoint = vi.fn().mockResolvedValueOnce(Promise.resolve(false)); }); afterEach(() => { diff --git a/packages/credential-provider-imds/src/remoteProvider/retry.spec.ts b/packages/credential-provider-imds/src/remoteProvider/retry.spec.ts index c1b2f7d8b1d..a9925e781c2 100644 --- a/packages/credential-provider-imds/src/remoteProvider/retry.spec.ts +++ b/packages/credential-provider-imds/src/remoteProvider/retry.spec.ts @@ -4,7 +4,7 @@ describe("retry", () => { const successMsg = "Success"; const errorMsg = "Expected failure"; const retries = 10; - const retryable = jest.fn().mockRejectedValue(errorMsg); + const retryable = vi.fn().mockRejectedValue(errorMsg); afterEach(() => { jest.clearAllMocks(); diff --git a/packages/credential-provider-imds/src/utils/getExtendedInstanceMetadataCredentials.spec.ts b/packages/credential-provider-imds/src/utils/getExtendedInstanceMetadataCredentials.spec.ts index 8ee4cdfa06f..5efd8d366be 100644 --- a/packages/credential-provider-imds/src/utils/getExtendedInstanceMetadataCredentials.spec.ts +++ b/packages/credential-provider-imds/src/utils/getExtendedInstanceMetadataCredentials.spec.ts @@ -9,7 +9,7 @@ describe("getExtendedInstanceMetadataCredentials()", () => { secretAccessKey: "secret", }; const logger: Logger = { - warn: jest.fn(), + warn: vi.fn(), } as any; beforeEach(() => { diff --git a/packages/credential-provider-imds/src/utils/staticStabilityProvider.spec.ts b/packages/credential-provider-imds/src/utils/staticStabilityProvider.spec.ts index e0e6cd4cdfd..1b2bd4522bc 100644 --- a/packages/credential-provider-imds/src/utils/staticStabilityProvider.spec.ts +++ b/packages/credential-provider-imds/src/utils/staticStabilityProvider.spec.ts @@ -35,7 +35,7 @@ describe("staticStabilityProvider", () => { }); it("should refresh credentials if provider is functional", async () => { - const provider = jest.fn(); + const provider = vi.fn(); const stableProvider = staticStabilityProvider(provider); const repeat = 3; for (let i = 0; i < repeat; i++) { @@ -46,7 +46,7 @@ describe("staticStabilityProvider", () => { }); it("should throw if cannot load credentials at 1st load", async () => { - const provider = jest.fn().mockRejectedValue("Error"); + const provider = vi.fn().mockRejectedValue("Error"); try { await staticStabilityProvider(provider)(); fail("This provider should throw"); @@ -58,7 +58,7 @@ describe("staticStabilityProvider", () => { }); it("should extend expired credentials if refresh fails", async () => { - const provider = jest.fn().mockResolvedValueOnce(mockCreds).mockRejectedValue("Error"); + const provider = vi.fn().mockResolvedValueOnce(mockCreds).mockRejectedValue("Error"); const stableProvider = staticStabilityProvider(provider); expect(await stableProvider()).toEqual(mockCreds); const repeat = 3; @@ -76,7 +76,7 @@ describe("staticStabilityProvider", () => { it("should extend expired credentials if loaded expired credentials", async () => { const ONE_HOUR_AGO = new Date(Date.now() - 60 * 60 * 1000); - const provider = jest.fn().mockResolvedValue({ ...mockCreds, expiration: ONE_HOUR_AGO }); + const provider = vi.fn().mockResolvedValue({ ...mockCreds, expiration: ONE_HOUR_AGO }); const stableProvider = staticStabilityProvider(provider); const repeat = 3; for (let i = 0; i < repeat; i++) { @@ -88,8 +88,8 @@ describe("staticStabilityProvider", () => { }); it("should allow custom logger to print warning messages", async () => { - const provider = jest.fn().mockResolvedValueOnce(mockCreds).mockRejectedValue("Error"); - const logger = { warn: jest.fn() } as unknown as Logger; + const provider = vi.fn().mockResolvedValueOnce(mockCreds).mockRejectedValue("Error"); + const logger = { warn: vi.fn() } as unknown as Logger; const stableProvider = staticStabilityProvider(provider, { logger }); expect(await stableProvider()).toEqual(mockCreds); // load initial creds await stableProvider(); diff --git a/packages/eventstream-codec/src/MessageDecoderStream.spec.ts b/packages/eventstream-codec/src/MessageDecoderStream.spec.ts index 13e752fb15c..da9c26966f2 100644 --- a/packages/eventstream-codec/src/MessageDecoderStream.spec.ts +++ b/packages/eventstream-codec/src/MessageDecoderStream.spec.ts @@ -15,11 +15,11 @@ describe("MessageDecoderStream", () => { }; const messageDecoderMock = { - decode: jest.fn().mockReturnValueOnce(message1).mockReturnValueOnce(message2), - feed: jest.fn(), - endOfStream: jest.fn(), - getMessage: jest.fn(), - getAvailableMessages: jest.fn(), + decode: vi.fn().mockReturnValueOnce(message1).mockReturnValueOnce(message2), + feed: vi.fn(), + endOfStream: vi.fn(), + getMessage: vi.fn(), + getAvailableMessages: vi.fn(), }; const inputStream = async function* () { diff --git a/packages/eventstream-codec/src/MessageEncoderStream.spec.ts b/packages/eventstream-codec/src/MessageEncoderStream.spec.ts index b8b1a4d583b..537f2001916 100644 --- a/packages/eventstream-codec/src/MessageEncoderStream.spec.ts +++ b/packages/eventstream-codec/src/MessageEncoderStream.spec.ts @@ -13,7 +13,7 @@ describe("MessageEncoderStream", () => { }; const messageEncoderMock = { - encode: jest.fn().mockReturnValueOnce(new Uint8Array(1)).mockReturnValueOnce(new Uint8Array(2)), + encode: vi.fn().mockReturnValueOnce(new Uint8Array(1)).mockReturnValueOnce(new Uint8Array(2)), }; const inputStream = async function* () { @@ -49,7 +49,7 @@ describe("MessageEncoderStream", () => { }; const messageEncoderMock = { - encode: jest.fn().mockReturnValueOnce(new Uint8Array(1)).mockReturnValueOnce(new Uint8Array(2)), + encode: vi.fn().mockReturnValueOnce(new Uint8Array(1)).mockReturnValueOnce(new Uint8Array(2)), }; const inputStream = async function* () { diff --git a/packages/eventstream-codec/src/SmithyMessageEncoderStream.spec.ts b/packages/eventstream-codec/src/SmithyMessageEncoderStream.spec.ts index f12e4567c47..82b6b20d78f 100644 --- a/packages/eventstream-codec/src/SmithyMessageEncoderStream.spec.ts +++ b/packages/eventstream-codec/src/SmithyMessageEncoderStream.spec.ts @@ -14,7 +14,7 @@ describe("SmithyMessageEncoderStream", () => { body: new Uint8Array(2), }; - const serializer = jest.fn().mockReturnValueOnce(message1).mockReturnValueOnce(message2); + const serializer = vi.fn().mockReturnValueOnce(message1).mockReturnValueOnce(message2); const inputStream = async function* () { yield "first"; diff --git a/packages/eventstream-serde-config-resolver/src/EventStreamSerdeConfig.spec.ts b/packages/eventstream-serde-config-resolver/src/EventStreamSerdeConfig.spec.ts index c89eb402b5a..bb19358a8b9 100644 --- a/packages/eventstream-serde-config-resolver/src/EventStreamSerdeConfig.spec.ts +++ b/packages/eventstream-serde-config-resolver/src/EventStreamSerdeConfig.spec.ts @@ -1,7 +1,7 @@ import { resolveEventStreamSerdeConfig } from "./EventStreamSerdeConfig"; describe("resolveEventStreamSerdeConfig", () => { - const eventStreamSerdeProvider = jest.fn(); + const eventStreamSerdeProvider = vi.fn(); afterEach(() => { jest.clearAllMocks(); diff --git a/packages/fetch-http-handler/src/fetch-http-handler.spec.ts b/packages/fetch-http-handler/src/fetch-http-handler.spec.ts index 546fca31b5d..d4de84c0209 100644 --- a/packages/fetch-http-handler/src/fetch-http-handler.spec.ts +++ b/packages/fetch-http-handler/src/fetch-http-handler.spec.ts @@ -4,11 +4,11 @@ import { HttpRequest } from "@smithy/protocol-http"; import { FetchHttpHandler, keepAliveSupport } from "./fetch-http-handler"; import { requestTimeout } from "./request-timeout"; -const mockRequest = jest.fn(); +const mockRequest = vi.fn(); let timeoutSpy: jest.SpyInstance; (global as any).Request = mockRequest; -(global as any).Headers = jest.fn(); +(global as any).Headers = vi.fn(); describe(FetchHttpHandler.name, () => { beforeEach(() => { @@ -26,14 +26,14 @@ describe(FetchHttpHandler.name, () => { it("makes requests using fetch", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob(["FOO"])), + blob: vi.fn().mockResolvedValue(new Blob(["FOO"])), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler(); @@ -47,14 +47,14 @@ describe(FetchHttpHandler.name, () => { it("put HttpClientConfig", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob(["FOO"])), + blob: vi.fn().mockResolvedValue(new Blob(["FOO"])), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler(); @@ -68,14 +68,14 @@ describe(FetchHttpHandler.name, () => { it("update HttpClientConfig", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob(["FOO"])), + blob: vi.fn().mockResolvedValue(new Blob(["FOO"])), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler({ requestTimeout: 200 }); @@ -96,14 +96,14 @@ describe(FetchHttpHandler.name, () => { const mockResponse = { body: null, headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob(["FOO"])), + blob: vi.fn().mockResolvedValue(new Blob(["FOO"])), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler(); @@ -117,14 +117,14 @@ describe(FetchHttpHandler.name, () => { it("properly constructs url", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; @@ -151,10 +151,10 @@ describe(FetchHttpHandler.name, () => { it("will omit body if method is GET", async () => { const mockResponse = { - headers: { entries: jest.fn().mockReturnValue([]) }, - blob: jest.fn().mockResolvedValue(new Blob()), + headers: { entries: vi.fn().mockReturnValue([]) }, + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; @@ -176,10 +176,10 @@ describe(FetchHttpHandler.name, () => { it("will omit body if method is HEAD", async () => { const mockResponse = { - headers: { entries: jest.fn().mockReturnValue([]) }, - blob: jest.fn().mockResolvedValue(new Blob()), + headers: { entries: vi.fn().mockReturnValue([]) }, + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; @@ -202,14 +202,14 @@ describe(FetchHttpHandler.name, () => { it("will not make request if already aborted", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler(); @@ -229,16 +229,16 @@ describe(FetchHttpHandler.name, () => { it("will pass abortSignal to fetch if supported", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; - (global as any).AbortController = jest.fn(); + (global as any).AbortController = vi.fn(); const fetchHttpHandler = new FetchHttpHandler(); await fetchHttpHandler.handle({} as any, { @@ -255,14 +255,14 @@ describe(FetchHttpHandler.name, () => { it("will pass timeout to request timeout", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; timeoutSpy = jest.spyOn({ requestTimeout }, "requestTimeout"); @@ -282,7 +282,7 @@ describe(FetchHttpHandler.name, () => { }, blob: async () => new Blob(), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; timeoutSpy = jest.spyOn({ requestTimeout }, "requestTimeout"); @@ -296,7 +296,7 @@ describe(FetchHttpHandler.name, () => { }); it("will throw timeout error it timeout finishes before request", async () => { - const mockFetch = jest.fn(() => { + const mockFetch = vi.fn(() => { return new Promise(() => {}); }); (global as any).fetch = mockFetch; @@ -311,7 +311,7 @@ describe(FetchHttpHandler.name, () => { it("can be aborted before fetch completes", async () => { const abortController = new AbortController(); - const mockFetch = jest.fn(() => { + const mockFetch = vi.fn(() => { return new Promise(() => {}); }); (global as any).fetch = mockFetch; @@ -334,13 +334,13 @@ describe(FetchHttpHandler.name, () => { it("creates correct HTTPResponse object", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([["foo", "bar"]]), + entries: vi.fn().mockReturnValue([["foo", "bar"]]), }, - blob: jest.fn().mockResolvedValue(new Blob(["FOO"])), + blob: vi.fn().mockResolvedValue(new Blob(["FOO"])), status: 200, statusText: "foo", }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler(); @@ -364,14 +364,14 @@ describe(FetchHttpHandler.name, () => { it("will pass keepalive as false by default to request if supported", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler(); @@ -385,14 +385,14 @@ describe(FetchHttpHandler.name, () => { it("will pass keepalive to request if supported", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; const fetchHttpHandler = new FetchHttpHandler({ keepAlive: true }); @@ -406,14 +406,14 @@ describe(FetchHttpHandler.name, () => { it("will not have keepalive property in request if not supported", async () => { const mockResponse = { headers: { - entries: jest.fn().mockReturnValue([ + entries: vi.fn().mockReturnValue([ ["foo", "bar"], ["bizz", "bazz"], ]), }, - blob: jest.fn().mockResolvedValue(new Blob()), + blob: vi.fn().mockResolvedValue(new Blob()), }; - const mockFetch = jest.fn().mockResolvedValue(mockResponse); + const mockFetch = vi.fn().mockResolvedValue(mockResponse); (global as any).fetch = mockFetch; mockRequest.mockImplementation(() => null); diff --git a/packages/fetch-http-handler/src/stream-collector.spec.ts b/packages/fetch-http-handler/src/stream-collector.spec.ts index 7f7e47e9ffc..16b0e74234a 100644 --- a/packages/fetch-http-handler/src/stream-collector.spec.ts +++ b/packages/fetch-http-handler/src/stream-collector.spec.ts @@ -19,7 +19,7 @@ describe("streamCollector", () => { it("returns a Uint8Array when blob is empty and when FileReader data is null(in IE)", (done) => { (global as any).FileReader = function FileReader() { this.result = null; //In IE, FileReader.result is null after reading empty blob - this.readAsDataURL = jest.fn().mockImplementation(() => { + this.readAsDataURL = vi.fn().mockImplementation(() => { if (this.onloadend) { this.readyState = 2; this.onloadend(); diff --git a/packages/hash-stream-node/src/readableStreamHasher.spec.ts b/packages/hash-stream-node/src/readableStreamHasher.spec.ts index 57548cd3df6..7ea440ecb92 100644 --- a/packages/hash-stream-node/src/readableStreamHasher.spec.ts +++ b/packages/hash-stream-node/src/readableStreamHasher.spec.ts @@ -7,14 +7,14 @@ import { readableStreamHasher } from "./readableStreamHasher"; jest.mock("./HashCalculator"); describe(readableStreamHasher.name, () => { - const mockDigest = jest.fn(); - const mockHashCtor = jest.fn().mockImplementation(() => ({ - update: jest.fn(), + const mockDigest = vi.fn(); + const mockHashCtor = vi.fn().mockImplementation(() => ({ + update: vi.fn(), digest: mockDigest, })); - const mockHashCalculatorWrite = jest.fn(); - const mockHashCalculatorEnd = jest.fn(); + const mockHashCalculatorWrite = vi.fn(); + const mockHashCalculatorEnd = vi.fn(); const mockHash = new Uint8Array(Buffer.from("mockHash")); diff --git a/packages/is-array-buffer/src/index.spec.ts b/packages/is-array-buffer/src/index.spec.ts index 97986abed0e..385a3fff1a3 100644 --- a/packages/is-array-buffer/src/index.spec.ts +++ b/packages/is-array-buffer/src/index.spec.ts @@ -26,7 +26,7 @@ describe("isArrayBuffer", () => { it("should return true for ArrayBuffers created with a different instance of the ArrayBuffer constructor", () => { const buffer = new ArrayBuffer(0); - (ArrayBuffer as any) = jest.fn(() => buffer); + (ArrayBuffer as any) = vi.fn(() => buffer); expect(buffer).not.toBeInstanceOf(ArrayBuffer); expect(isArrayBuffer(buffer)).toBe(true); diff --git a/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.spec.ts b/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.spec.ts index 31bf6a45111..48ddb727604 100644 --- a/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.spec.ts +++ b/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.spec.ts @@ -4,16 +4,16 @@ import { ChecksumConstructor } from "@smithy/types"; import { applyMd5BodyChecksumMiddleware } from "./applyMd5BodyChecksumMiddleware"; describe("applyMd5BodyChecksumMiddleware", () => { - const mockEncoder = jest.fn().mockReturnValue("encoded"); - const mockHashUpdate = jest.fn(); - const mockHashDigest = jest.fn().mockReturnValue(new Uint8Array(0)); - const mockHashReset = jest.fn(); + const mockEncoder = vi.fn().mockReturnValue("encoded"); + const mockHashUpdate = vi.fn(); + const mockHashDigest = vi.fn().mockReturnValue(new Uint8Array(0)); + const mockHashReset = vi.fn(); const MockHash: ChecksumConstructor = class {} as any; MockHash.prototype.update = mockHashUpdate; MockHash.prototype.digest = mockHashDigest; MockHash.prototype.reset = mockHashReset; - const next = jest.fn(); + const next = vi.fn(); class ExoticStream {} diff --git a/packages/middleware-compression/src/compressStream.browser.spec.ts b/packages/middleware-compression/src/compressStream.browser.spec.ts index bca22275e4c..43a717de861 100644 --- a/packages/middleware-compression/src/compressStream.browser.spec.ts +++ b/packages/middleware-compression/src/compressStream.browser.spec.ts @@ -10,8 +10,8 @@ describe(compressStream.name, () => { const compressionSuffix = "compressed"; const compressionSeparator = "."; const asyncGzip = { - ondata: jest.fn(), - push: jest.fn().mockImplementation((chunk, final) => { + ondata: vi.fn(), + push: vi.fn().mockImplementation((chunk, final) => { const data = typeof chunk === "string" ? [chunk, compressionSuffix].join(compressionSeparator) : null; asyncGzip.ondata(undefined, data, final); }), diff --git a/packages/middleware-compression/src/compressStream.spec.ts b/packages/middleware-compression/src/compressStream.spec.ts index 96ee325ca28..a0c7a8ccb63 100644 --- a/packages/middleware-compression/src/compressStream.spec.ts +++ b/packages/middleware-compression/src/compressStream.spec.ts @@ -14,12 +14,12 @@ describe(compressStream.name, () => { }; const testInputStream = Readable.from(getGenerator(["input"])()); - const mockGzipFn = jest.fn(); + const mockGzipFn = vi.fn(); const testOutputStream = Readable.from(getGenerator(["input", "gzipped"])()); beforeEach(() => { (createGzip as jest.Mock).mockReturnValue(mockGzipFn); - testInputStream.pipe = jest.fn().mockReturnValue(testOutputStream); + testInputStream.pipe = vi.fn().mockReturnValue(testOutputStream); }); afterEach(() => { diff --git a/packages/middleware-compression/src/compressString.spec.ts b/packages/middleware-compression/src/compressString.spec.ts index ed7d2f80580..c5ecb31e42f 100644 --- a/packages/middleware-compression/src/compressString.spec.ts +++ b/packages/middleware-compression/src/compressString.spec.ts @@ -7,9 +7,9 @@ const compressionSuffix = "compressed"; const compressionSeparator = "."; jest.mock("@smithy/util-utf8"); -jest.mock("util", () => ({ promisify: jest.fn().mockImplementation((fn) => fn) })); +jest.mock("util", () => ({ promisify: vi.fn().mockImplementation((fn) => fn) })); jest.mock("zlib", () => ({ - gzip: jest.fn().mockImplementation((data) => [data, compressionSuffix].join(compressionSeparator)), + gzip: vi.fn().mockImplementation((data) => [data, compressionSuffix].join(compressionSeparator)), })); describe(compressString.name, () => { @@ -38,7 +38,7 @@ describe(compressString.name, () => { it("should throw an error if compression fails", async () => { const compressionErrorMsg = "compression error message"; const compressionError = new Error(compressionErrorMsg); - ((gzip as unknown) as jest.Mock).mockImplementationOnce(() => { + (gzip as unknown as jest.Mock).mockImplementationOnce(() => { throw compressionError; }); diff --git a/packages/middleware-compression/src/compressionMiddleware.spec.ts b/packages/middleware-compression/src/compressionMiddleware.spec.ts index 88f8832fe4c..95becf2d1af 100644 --- a/packages/middleware-compression/src/compressionMiddleware.spec.ts +++ b/packages/middleware-compression/src/compressionMiddleware.spec.ts @@ -14,7 +14,7 @@ jest.mock("./isStreaming"); describe(compressionMiddleware.name, () => { const mockBody = "body"; const mockConfig = { - bodyLengthChecker: jest.fn().mockReturnValue(mockBody.length), + bodyLengthChecker: vi.fn().mockReturnValue(mockBody.length), disableRequestCompression: async () => false, requestMinCompressionSizeBytes: async () => 0, }; @@ -22,7 +22,7 @@ describe(compressionMiddleware.name, () => { encodings: [CompressionAlgorithm.GZIP], }; - const mockNext = jest.fn(); + const mockNext = vi.fn(); const mockContext = {}; const mockArgs = { request: { headers: {}, body: mockBody } }; diff --git a/packages/middleware-compression/src/getCompressionPlugin.spec.ts b/packages/middleware-compression/src/getCompressionPlugin.spec.ts index 969bbf5bb24..099ff62e95e 100644 --- a/packages/middleware-compression/src/getCompressionPlugin.spec.ts +++ b/packages/middleware-compression/src/getCompressionPlugin.spec.ts @@ -5,7 +5,7 @@ jest.mock("./compressionMiddleware"); describe(getCompressionPlugin.name, () => { const config = { - bodyLengthChecker: jest.fn(), + bodyLengthChecker: vi.fn(), disableRequestCompression: async () => false, requestMinCompressionSizeBytes: async () => 0, }; @@ -16,7 +16,7 @@ describe(getCompressionPlugin.name, () => { (compressionMiddleware as jest.Mock).mockReturnValueOnce(middlewareReturn); const plugin = getCompressionPlugin(config, middlewareConfig); - const commandStack = { add: jest.fn() }; + const commandStack = { add: vi.fn() }; // @ts-ignore plugin.applyToStack(commandStack); diff --git a/packages/middleware-compression/src/resolveCompressionConfig.spec.ts b/packages/middleware-compression/src/resolveCompressionConfig.spec.ts index a2e78860173..c9514d7b282 100644 --- a/packages/middleware-compression/src/resolveCompressionConfig.spec.ts +++ b/packages/middleware-compression/src/resolveCompressionConfig.spec.ts @@ -2,7 +2,7 @@ import { resolveCompressionConfig } from "./resolveCompressionConfig"; describe(resolveCompressionConfig.name, () => { const mockConfig = { - bodyLengthChecker: jest.fn(), + bodyLengthChecker: vi.fn(), disableRequestCompression: false, requestMinCompressionSizeBytes: 0, }; diff --git a/packages/middleware-retry/src/AdaptiveRetryStrategy.spec.ts b/packages/middleware-retry/src/AdaptiveRetryStrategy.spec.ts index bde51f3c9bd..98eb93b5f9a 100644 --- a/packages/middleware-retry/src/AdaptiveRetryStrategy.spec.ts +++ b/packages/middleware-retry/src/AdaptiveRetryStrategy.spec.ts @@ -8,10 +8,10 @@ jest.mock("./StandardRetryStrategy"); jest.mock("@smithy/util-retry"); describe(AdaptiveRetryStrategy.name, () => { - const maxAttemptsProvider = jest.fn(); + const maxAttemptsProvider = vi.fn(); const mockDefaultRateLimiter = { - getSendToken: jest.fn(), - updateClientSendingRate: jest.fn(), + getSendToken: vi.fn(), + updateClientSendingRate: vi.fn(), }; beforeEach(() => { @@ -24,8 +24,8 @@ describe(AdaptiveRetryStrategy.name, () => { describe("constructor", () => { it("calls super constructor", () => { - const retryDecider = jest.fn(); - const delayDecider = jest.fn(); + const retryDecider = vi.fn(); + const delayDecider = vi.fn(); const retryQuota = {} as RetryQuota; const rateLimiter = {} as RateLimiter; @@ -72,7 +72,7 @@ describe(AdaptiveRetryStrategy.name, () => { const mockedSuperRetry = jest.spyOn(StandardRetryStrategy.prototype, "retry"); beforeEach(async () => { - const next = jest.fn(); + const next = vi.fn(); const retryStrategy = new AdaptiveRetryStrategy(maxAttemptsProvider); await retryStrategy.retry(next, { request: { headers: {} } } as any); expect(mockedSuperRetry).toHaveBeenCalledTimes(1); diff --git a/packages/middleware-retry/src/StandardRetryStrategy.spec.ts b/packages/middleware-retry/src/StandardRetryStrategy.spec.ts index ad63a672f17..a27764b7d08 100644 --- a/packages/middleware-retry/src/StandardRetryStrategy.spec.ts +++ b/packages/middleware-retry/src/StandardRetryStrategy.spec.ts @@ -27,13 +27,13 @@ describe("defaultStrategy", () => { const maxAttempts = 3; const mockDefaultRetryQuota = { - hasRetryTokens: jest.fn().mockReturnValue(true), - retrieveRetryTokens: jest.fn().mockReturnValue(1), - releaseRetryTokens: jest.fn(), + hasRetryTokens: vi.fn().mockReturnValue(true), + retrieveRetryTokens: vi.fn().mockReturnValue(1), + releaseRetryTokens: vi.fn(), }; const mockSuccessfulOperation = (maxAttempts: number, options?: { mockResponse?: string }) => { - next = jest.fn().mockResolvedValueOnce({ + next = vi.fn().mockResolvedValueOnce({ response: options?.mockResponse, output: { $metadata: {} }, }); @@ -44,7 +44,7 @@ describe("defaultStrategy", () => { const mockFailedOperation = async (maxAttempts: number, options?: { mockError?: Error }) => { const mockError = options?.mockError ?? new Error("mockError"); - next = jest.fn().mockRejectedValue(mockError); + next = vi.fn().mockRejectedValue(mockError); const retryStrategy = new StandardRetryStrategy(() => Promise.resolve(maxAttempts)); try { @@ -62,7 +62,7 @@ describe("defaultStrategy", () => { output: { $metadata: {} }, }; - next = jest.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockResponse); + next = vi.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockResponse); const retryStrategy = new StandardRetryStrategy(() => Promise.resolve(maxAttempts)); return retryStrategy.retry(next, { request: { headers: {} } } as any); @@ -91,10 +91,10 @@ describe("defaultStrategy", () => { (defaultRetryDecider as jest.Mock).mockReturnValue(true); (getDefaultRetryQuota as jest.Mock).mockReturnValue(mockDefaultRetryQuota); (HttpRequest as unknown as jest.Mock).mockReturnValue({ - isInstance: jest.fn().mockReturnValue(false), + isInstance: vi.fn().mockReturnValue(false), }); (HttpResponse as unknown as jest.Mock).mockReturnValue({ - isInstance: jest.fn().mockReturnValue(false), + isInstance: vi.fn().mockReturnValue(false), }); (v4 as jest.Mock).mockReturnValue("42"); }); @@ -120,7 +120,7 @@ describe("defaultStrategy", () => { const maxAttempts = 1; const retryStrategy = new StandardRetryStrategy(() => Promise.resolve(maxAttempts)); for (const error of nonStandardErrors) { - next = jest.fn().mockRejectedValue(error); + next = vi.fn().mockRejectedValue(error); expect(retryStrategy.retry(next, { request: { headers: {} } } as any)).rejects.toBeInstanceOf(Error); } }); @@ -137,7 +137,7 @@ describe("defaultStrategy", () => { }); it("sets options.retryDecider if defined", () => { - const retryDecider = jest.fn(); + const retryDecider = vi.fn(); const retryStrategy = new StandardRetryStrategy(() => Promise.resolve(maxAttempts), { retryDecider, }); @@ -157,7 +157,7 @@ describe("defaultStrategy", () => { }); it("sets options.delayDecider if defined", () => { - const delayDecider = jest.fn(); + const delayDecider = vi.fn(); const retryStrategy = new StandardRetryStrategy(() => Promise.resolve(maxAttempts), { delayDecider, }); @@ -498,7 +498,7 @@ describe("defaultStrategy", () => { const uuidForInvocationTwo = "uuid-invocation-2"; (v4 as jest.Mock).mockReturnValueOnce(uuidForInvocationOne).mockReturnValueOnce(uuidForInvocationTwo); - const next = jest.fn().mockResolvedValue({ + const next = vi.fn().mockResolvedValue({ response: "mockResponse", output: { $metadata: {} }, }); @@ -561,7 +561,7 @@ describe("defaultStrategy", () => { (isInstance as unknown as jest.Mock).mockReturnValue(true); const mockError = new Error("mockError"); - next = jest.fn((args) => { + next = vi.fn((args) => { // the header needs to be verified inside jest.Mock as arguments in // jest.mocks.calls has the value passed in final call const index = next.mock.calls.length - 1; @@ -587,7 +587,7 @@ describe("defaultStrategy", () => { const { isInstance } = HttpRequest; (isInstance as unknown as jest.Mock).mockReturnValue(true); - next = jest.fn((args) => { + next = vi.fn((args) => { expect(args.request.headers["amz-sdk-request"]).toBe(`attempt=1; max=${DEFAULT_MAX_ATTEMPTS}`); return Promise.resolve({ response: "mockResponse", diff --git a/packages/middleware-retry/src/configurations.spec.ts b/packages/middleware-retry/src/configurations.spec.ts index 74193c95a49..4cfbabe3176 100644 --- a/packages/middleware-retry/src/configurations.spec.ts +++ b/packages/middleware-retry/src/configurations.spec.ts @@ -12,7 +12,7 @@ jest.mock("@smithy/util-middleware"); jest.mock("@smithy/util-retry"); describe(resolveRetryConfig.name, () => { - const retryMode = jest.fn() as any; + const retryMode = vi.fn() as any; beforeEach(() => { (normalizeProvider as jest.Mock).mockImplementation((input) => @@ -39,7 +39,7 @@ describe(resolveRetryConfig.name, () => { describe("retryStrategy", () => { it("passes retryStrategy if present", () => { const mockRetryStrategy = { - retry: jest.fn(), + retry: vi.fn(), }; const { retryStrategy } = resolveRetryConfig({ retryMode, diff --git a/packages/middleware-retry/src/delayDecider.spec.ts b/packages/middleware-retry/src/delayDecider.spec.ts index 4318dc138b3..0504f95d32b 100644 --- a/packages/middleware-retry/src/delayDecider.spec.ts +++ b/packages/middleware-retry/src/delayDecider.spec.ts @@ -6,7 +6,7 @@ describe("defaultDelayDecider", () => { const mathDotRandom = Math.random; beforeEach(() => { - Math.random = jest.fn().mockReturnValue(1); + Math.random = vi.fn().mockReturnValue(1); }); afterEach(() => { @@ -42,7 +42,7 @@ describe("defaultDelayDecider", () => { const delayBase = 100; const expectedDelay = Math.floor(mockRandomValue * 2 ** attempts * delayBase); it(`(${delayBase}, ${attempts}) with mock Math.random=${mockRandomValue} returns ${expectedDelay}`, () => { - Math.random = jest.fn().mockReturnValue(mockRandomValue); + Math.random = vi.fn().mockReturnValue(mockRandomValue); expect(defaultDelayDecider(delayBase, attempts)).toBe(expectedDelay); }); }); diff --git a/packages/middleware-retry/src/omitRetryHeadersMiddleware.spec.ts b/packages/middleware-retry/src/omitRetryHeadersMiddleware.spec.ts index a6d15b2686b..7ff18a47e65 100644 --- a/packages/middleware-retry/src/omitRetryHeadersMiddleware.spec.ts +++ b/packages/middleware-retry/src/omitRetryHeadersMiddleware.spec.ts @@ -10,8 +10,8 @@ import { describe("getOmitRetryHeadersPlugin", () => { const mockClientStack = { - add: jest.fn(), - addRelativeTo: jest.fn(), + add: vi.fn(), + addRelativeTo: vi.fn(), }; afterEach(() => { @@ -31,7 +31,7 @@ describe("omitRetryHeadersMiddleware", () => { }); it("remove retry headers", async () => { - const next = jest.fn(); + const next = vi.fn(); const args = { request: new HttpRequest({ headers: { diff --git a/packages/middleware-retry/src/retryMiddleware.spec.ts b/packages/middleware-retry/src/retryMiddleware.spec.ts index a76a618dd2a..37f11c62cec 100644 --- a/packages/middleware-retry/src/retryMiddleware.spec.ts +++ b/packages/middleware-retry/src/retryMiddleware.spec.ts @@ -12,21 +12,21 @@ jest.mock("uuid"); describe(getRetryPlugin.name, () => { const mockClientStack = { - add: jest.fn(), + add: vi.fn(), }; const mockRetryStrategy = { mode: "mock", - retry: jest.fn(), + retry: vi.fn(), }; beforeEach(() => { (isThrottlingError as jest.Mock).mockReturnValue(false); (isTransientError as jest.Mock).mockReturnValue(false); (isServerError as jest.Mock).mockReturnValue(false); (HttpRequest as unknown as jest.Mock).mockReturnValue({ - isInstance: jest.fn().mockReturnValue(false), + isInstance: vi.fn().mockReturnValue(false), }); (HttpResponse as unknown as jest.Mock).mockReturnValue({ - isInstance: jest.fn().mockReturnValue(false), + isInstance: vi.fn().mockReturnValue(false), }); (v4 as jest.Mock).mockReturnValue("42"); }); @@ -40,7 +40,7 @@ describe(getRetryPlugin.name, () => { it(`when maxAttempts=${maxAttempts}`, () => { getRetryPlugin({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue(mockRetryStrategy), + retryStrategy: vi.fn().mockResolvedValue(mockRetryStrategy), }).applyToStack(mockClientStack as unknown as MiddlewareStack); expect(mockClientStack.add).toHaveBeenCalledTimes(1); expect(mockClientStack.add.mock.calls[0][1]).toEqual(retryMiddlewareOptions); @@ -57,11 +57,11 @@ describe(retryMiddleware.name, () => { describe("RetryStrategy", () => { const mockRetryStrategy = { mode: "mock", - retry: jest.fn(), + retry: vi.fn(), }; it("calls retryStrategy.retry with next and args", async () => { - const next = jest.fn(); + const next = vi.fn(); const args = { request: { headers: {} }, }; @@ -69,7 +69,7 @@ describe(retryMiddleware.name, () => { await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -95,9 +95,9 @@ describe(retryMiddleware.name, () => { }; const mockRetryStrategy = { mode: "mock", - acquireInitialRetryToken: jest.fn().mockResolvedValue(mockRetryToken), - refreshRetryTokenForRetry: jest.fn().mockResolvedValue(mockRetryToken), - recordSuccess: jest.fn(), + acquireInitialRetryToken: vi.fn().mockResolvedValue(mockRetryToken), + refreshRetryTokenForRetry: vi.fn().mockResolvedValue(mockRetryToken), + recordSuccess: vi.fn(), }; const mockResponse = "mockResponse"; const mockSuccess = { @@ -117,10 +117,10 @@ describe(retryMiddleware.name, () => { }; it("calls acquireInitialRetryToken and records success when next succeeds", async () => { - const next = jest.fn().mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockResolvedValueOnce(mockSuccess); const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -136,21 +136,21 @@ describe(retryMiddleware.name, () => { it("throw last request error", async () => { const requestError = new Error("mockRequestError"); (isThrottlingError as jest.Mock).mockReturnValue(true); - const next = jest.fn().mockRejectedValue(requestError); + const next = vi.fn().mockRejectedValue(requestError); const errorInfo = { error: requestError, errorType: "THROTTLING", }; const mockRetryStrategy = { mode: "mock", - acquireInitialRetryToken: jest.fn().mockResolvedValue(mockRetryToken), - refreshRetryTokenForRetry: jest.fn().mockRejectedValue(new Error("Cannot refresh token")), - recordSuccess: jest.fn(), + acquireInitialRetryToken: vi.fn().mockResolvedValue(mockRetryToken), + refreshRetryTokenForRetry: vi.fn().mockRejectedValue(new Error("Cannot refresh token")), + recordSuccess: vi.fn(), }; try { await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -171,14 +171,14 @@ describe(retryMiddleware.name, () => { const mockError = new Error("mockError"); it("sets throttling error type", async () => { (isThrottlingError as jest.Mock).mockReturnValue(true); - const next = jest.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); const errorInfo = { error: mockError, errorType: "THROTTLING", }; const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -193,14 +193,14 @@ describe(retryMiddleware.name, () => { it("sets transient error type", async () => { (isTransientError as jest.Mock).mockReturnValue(true); (isThrottlingError as jest.Mock).mockReturnValue(false); - const next = jest.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); const errorInfo = { error: mockError, errorType: "TRANSIENT", }; const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -216,14 +216,14 @@ describe(retryMiddleware.name, () => { (isServerError as jest.Mock).mockReturnValue(true); (isTransientError as jest.Mock).mockReturnValue(false); (isThrottlingError as jest.Mock).mockReturnValue(false); - const next = jest.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); const errorInfo = { error: mockError, errorType: "SERVER_ERROR", }; const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -239,14 +239,14 @@ describe(retryMiddleware.name, () => { (isServerError as jest.Mock).mockReturnValue(false); (isTransientError as jest.Mock).mockReturnValue(false); (isThrottlingError as jest.Mock).mockReturnValue(false); - const next = jest.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); const errorInfo = { error: mockError, errorType: "CLIENT_ERROR", }; const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -268,14 +268,14 @@ describe(retryMiddleware.name, () => { headers: { ["other-header"]: "foo" }, }, }); - const next = jest.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(mockError).mockResolvedValueOnce(mockSuccess); const errorInfo = { error: mockError, errorType: "CLIENT_ERROR", }; const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -301,10 +301,10 @@ describe(retryMiddleware.name, () => { }; it("parses retry-after from date string", async () => { const error = getErrorWithValues(retryAfterDate.toISOString()); - const next = jest.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -318,10 +318,10 @@ describe(retryMiddleware.name, () => { }); it("parses retry-after from seconds", async () => { const error = getErrorWithValues(retryAfterDate.getTime() / 1000); - const next = jest.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -335,10 +335,10 @@ describe(retryMiddleware.name, () => { }); it("parses retry-after from Retry-After header name", async () => { const error = getErrorWithValues(retryAfterDate.toISOString(), "Retry-After"); - const next = jest.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); const { output } = await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -357,10 +357,10 @@ describe(retryMiddleware.name, () => { describe("retry headers", () => { describe("not added if HttpRequest.isInstance returns false", () => { it(`retry informational header: ${INVOCATION_ID_HEADER}`, async () => { - const next = jest.fn().mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockResolvedValueOnce(mockSuccess); await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -370,10 +370,10 @@ describe(retryMiddleware.name, () => { }); }); it(`header for each attempt as ${REQUEST_HEADER}`, async () => { - const next = jest.fn().mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockResolvedValueOnce(mockSuccess); await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -389,10 +389,10 @@ describe(retryMiddleware.name, () => { const { isInstance } = HttpRequest; (isInstance as unknown as jest.Mock).mockReturnValue(true); (isThrottlingError as jest.Mock).mockReturnValue(true); - const next = jest.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context @@ -407,10 +407,10 @@ describe(retryMiddleware.name, () => { const { isInstance } = HttpRequest; (isInstance as unknown as jest.Mock).mockReturnValue(true); (isThrottlingError as jest.Mock).mockReturnValue(true); - const next = jest.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); + const next = vi.fn().mockRejectedValueOnce(error).mockResolvedValueOnce(mockSuccess); await retryMiddleware({ maxAttempts: () => Promise.resolve(maxAttempts), - retryStrategy: jest.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), + retryStrategy: vi.fn().mockResolvedValue({ ...mockRetryStrategy, maxAttempts }), })( next, context diff --git a/packages/middleware-serde/src/deserializerMiddleware.spec.ts b/packages/middleware-serde/src/deserializerMiddleware.spec.ts index 2e870e02e69..df589b2c60b 100644 --- a/packages/middleware-serde/src/deserializerMiddleware.spec.ts +++ b/packages/middleware-serde/src/deserializerMiddleware.spec.ts @@ -3,8 +3,8 @@ import { EndpointBearer, SerdeFunctions } from "@smithy/types"; import { deserializerMiddleware } from "./deserializerMiddleware"; describe("deserializerMiddleware", () => { - const mockNext = jest.fn(); - const mockDeserializer = jest.fn(); + const mockNext = vi.fn(); + const mockDeserializer = vi.fn(); const mockOptions = { endpoint: () => diff --git a/packages/middleware-serde/src/serializerMiddleware.spec.ts b/packages/middleware-serde/src/serializerMiddleware.spec.ts index 3b5c0ec3f52..3390b6f874d 100644 --- a/packages/middleware-serde/src/serializerMiddleware.spec.ts +++ b/packages/middleware-serde/src/serializerMiddleware.spec.ts @@ -3,8 +3,8 @@ import { EndpointBearer, SerdeFunctions } from "@smithy/types"; import { serializerMiddleware } from "./serializerMiddleware"; describe("serializerMiddleware", () => { - const mockNext = jest.fn(); - const mockSerializer = jest.fn(); + const mockNext = vi.fn(); + const mockSerializer = vi.fn(); const mockOptions = { endpoint: () => diff --git a/packages/middleware-stack/src/MiddlewareStack.spec.ts b/packages/middleware-stack/src/MiddlewareStack.spec.ts index da9c3cc6b8b..193aab352a5 100644 --- a/packages/middleware-stack/src/MiddlewareStack.spec.ts +++ b/packages/middleware-stack/src/MiddlewareStack.spec.ts @@ -53,7 +53,7 @@ describe("MiddlewareStack", () => { priority: "low", step: "deserialize", }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); @@ -92,7 +92,7 @@ describe("MiddlewareStack", () => { const stack = constructStack(); stack.add(getConcatMiddleware("A"), { name: "A" }); stack.add(getConcatMiddleware("override"), { name: "A", override: true }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -105,7 +105,7 @@ describe("MiddlewareStack", () => { const stack = constructStack(); stack.add(getConcatMiddleware("A"), { aliases: ["ALIAS"] }); stack.add(getConcatMiddleware("override"), { name: "ALIAS", override: true }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -118,7 +118,7 @@ describe("MiddlewareStack", () => { const stack = constructStack(); stack.add(getConcatMiddleware("A"), { name: "ALIAS" }); stack.add(getConcatMiddleware("override"), { aliases: ["ALIAS"], override: true }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -209,7 +209,7 @@ describe("MiddlewareStack", () => { relation: "after", toMiddleware: "AliasI", }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -240,7 +240,7 @@ describe("MiddlewareStack", () => { toMiddleware: "AliasF", }); stack.add(getConcatMiddleware("G"), { name: "G" }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -269,7 +269,7 @@ describe("MiddlewareStack", () => { relation: "after", toMiddleware: "A", }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -284,7 +284,7 @@ describe("MiddlewareStack", () => { relation: "before", toMiddleware: "non_exist", }); - const inner = jest.fn(); + const inner = vi.fn(); try { stack.resolve(inner, {} as any); } catch (e) { @@ -303,7 +303,7 @@ describe("MiddlewareStack", () => { toMiddleware: "A", override: true, }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -326,7 +326,7 @@ describe("MiddlewareStack", () => { toMiddleware: "A", override: true, }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -349,7 +349,7 @@ describe("MiddlewareStack", () => { toMiddleware: "A", override: true, }); - const inner = jest.fn(); + const inner = vi.fn(); const composed = stack.resolve(inner, {} as any); await composed({ input: [] }); expect(inner.mock.calls.length).toBe(1); @@ -427,7 +427,7 @@ describe("MiddlewareStack", () => { aliases: ["AliasC"], }); const secondStack = stack.clone(); - const inner = jest.fn(); + const inner = vi.fn(); await secondStack.resolve(inner, {} as any)({ input: [] }); expect(inner.mock.calls.length).toBe(1); expect(inner).toBeCalledWith({ input: ["A", "B", "C"] }); @@ -464,7 +464,7 @@ describe("MiddlewareStack", () => { toMiddleware: "AliasB", }); - const inner = jest.fn(); + const inner = vi.fn(); await stack.concat(secondStack).resolve(inner, {} as any)({ input: [] }); expect(inner.mock.calls.length).toBe(1); expect(inner).toBeCalledWith({ input: ["A", "B", "C", "D"] }); @@ -475,7 +475,7 @@ describe("MiddlewareStack", () => { stack.add(getConcatMiddleware("A")); const secondStack = constructStack(); secondStack.add(getConcatMiddleware("B")); - const inner = jest.fn(); + const inner = vi.fn(); await stack.concat(secondStack).resolve(inner, {} as any)({ input: [] }); expect(inner.mock.calls.length).toBe(1); expect(inner).toBeCalledWith({ input: ["A", "B"] }); @@ -505,7 +505,7 @@ describe("MiddlewareStack", () => { stack.remove("toRemove"); - const inner = jest.fn(); + const inner = vi.fn(); await stack.resolve(inner, {} as any)({ input: [] }); expect(inner.mock.calls.length).toBe(1); expect(inner).toBeCalledWith({ input: ["don't remove me"] }); @@ -527,7 +527,7 @@ describe("MiddlewareStack", () => { stack.remove("toRemove"); - const inner = jest.fn(); + const inner = vi.fn(); await stack.resolve(inner, {} as any)({ input: [] }); expect(inner.mock.calls.length).toBe(1); expect(inner).toBeCalledWith({ input: ["don't remove me"] }); @@ -541,7 +541,7 @@ describe("MiddlewareStack", () => { stack.add(mw, { aliases: ["toRemove2"] }); stack.remove(mw); - const inner = jest.fn(); + const inner = vi.fn(); await stack.resolve(inner, {} as any)({ input: [] }); expect(inner.mock.calls.length).toBe(1); expect(inner).toBeCalledWith({ input: ["don't remove me!"] }); @@ -605,7 +605,7 @@ describe("MiddlewareStack", () => { }, }; stack.use(plugin); - const inner = jest.fn(({ input }: DeserializeHandlerArguments) => { + const inner = vi.fn(({ input }: DeserializeHandlerArguments) => { expect(input).toEqual(["first", "second"]); return Promise.resolve({ response: {} }); }); diff --git a/packages/node-config-provider/src/fromEnv.spec.ts b/packages/node-config-provider/src/fromEnv.spec.ts index 9ead7ad07f3..72c9f4bdbcf 100644 --- a/packages/node-config-provider/src/fromEnv.spec.ts +++ b/packages/node-config-provider/src/fromEnv.spec.ts @@ -30,7 +30,7 @@ describe("fromEnv", () => { it("return complex value from the getter", () => { type Value = { Foo: string }; const value: Value = { Foo: "bar" }; - const getter: (env: any) => Value = jest.fn().mockReturnValue(value); + const getter: (env: any) => Value = vi.fn().mockReturnValue(value); // Validate the generic type works return expect(fromEnv(getter)()).resolves.toEqual(value); }); @@ -42,7 +42,7 @@ describe("fromEnv", () => { it("throws when the getter function throws", () => { const exception = new Error("Exception when getting the config"); - const getter: (env: any) => any = jest.fn().mockRejectedValue(exception); + const getter: (env: any) => any = vi.fn().mockRejectedValue(exception); return expect(fromEnv(getter)()).rejects.toEqual(exception); }); }); diff --git a/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts b/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts index c2b3c2edb7f..8ce6bed0da3 100644 --- a/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts +++ b/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts @@ -5,8 +5,8 @@ import { ParsedIniData, Profile } from "@smithy/types"; import { fromSharedConfigFiles, GetterFromConfig, SharedConfigInit } from "./fromSharedConfigFiles"; jest.mock("@smithy/shared-ini-file-loader", () => ({ - getProfileName: jest.fn(), - loadSharedConfigFiles: jest.fn(), + getProfileName: vi.fn(), + loadSharedConfigFiles: vi.fn(), })); describe("fromSharedConfigFiles", () => { diff --git a/packages/node-config-provider/src/fromStatic.spec.ts b/packages/node-config-provider/src/fromStatic.spec.ts index 235d29510f0..c0049e11c7a 100644 --- a/packages/node-config-provider/src/fromStatic.spec.ts +++ b/packages/node-config-provider/src/fromStatic.spec.ts @@ -3,7 +3,7 @@ import { fromStatic as convertToProvider } from "@smithy/property-provider"; import { fromStatic } from "./fromStatic"; jest.mock("@smithy/property-provider", () => ({ - fromStatic: jest.fn(), + fromStatic: vi.fn(), })); describe("fromStatic", () => { @@ -15,14 +15,14 @@ describe("fromStatic", () => { }); it("should call the getter function", async () => { - const getter = jest.fn().mockReturnValue(value); + const getter = vi.fn().mockReturnValue(value); const config = fromStatic(getter); expect(await config()).toBe(value); expect(getter).toHaveBeenCalled(); }); it("should call the async provider function", async () => { - const getter = jest.fn().mockResolvedValue(value); + const getter = vi.fn().mockResolvedValue(value); const config = fromStatic(getter); expect(await config()).toBe(value); expect(getter).toHaveBeenCalled(); diff --git a/packages/node-http-handler/src/node-http-handler.spec.ts b/packages/node-http-handler/src/node-http-handler.spec.ts index c9dc27ecf6b..cf8ece68a98 100644 --- a/packages/node-http-handler/src/node-http-handler.spec.ts +++ b/packages/node-http-handler/src/node-http-handler.spec.ts @@ -727,7 +727,7 @@ describe("NodeHttpHandler", () => { describe("checkSocketUsage", () => { beforeEach(() => { - jest.spyOn(console, "warn").mockImplementation(jest.fn()); + jest.spyOn(console, "warn").mockImplementation(vi.fn()); }); afterEach(() => { diff --git a/packages/node-http-handler/src/set-connection-timeout.spec.ts b/packages/node-http-handler/src/set-connection-timeout.spec.ts index 0f82815f13a..113ba29d4b1 100644 --- a/packages/node-http-handler/src/set-connection-timeout.spec.ts +++ b/packages/node-http-handler/src/set-connection-timeout.spec.ts @@ -1,10 +1,10 @@ import { setConnectionTimeout } from "./set-connection-timeout"; describe("setConnectionTimeout", () => { - const reject = jest.fn(); + const reject = vi.fn(); const clientRequest: any = { - on: jest.fn(), - destroy: jest.fn(), + on: vi.fn(), + destroy: vi.fn(), }; beforeEach(() => { @@ -25,7 +25,7 @@ describe("setConnectionTimeout", () => { const timeoutInMs = 100; const mockSocket = { connecting: true, - on: jest.fn(), + on: vi.fn(), }; beforeEach(() => { diff --git a/packages/node-http-handler/src/set-socket-timeout.spec.ts b/packages/node-http-handler/src/set-socket-timeout.spec.ts index 8b44679af55..75f60e4be3b 100644 --- a/packages/node-http-handler/src/set-socket-timeout.spec.ts +++ b/packages/node-http-handler/src/set-socket-timeout.spec.ts @@ -2,8 +2,8 @@ import { setSocketTimeout } from "./set-socket-timeout"; describe("setSocketTimeout", () => { const clientRequest: any = { - destroy: jest.fn(), - setTimeout: jest.fn(), + destroy: vi.fn(), + setTimeout: vi.fn(), }; beforeEach(() => { @@ -11,21 +11,21 @@ describe("setSocketTimeout", () => { }); it(`sets the request's timeout if provided`, () => { - setSocketTimeout(clientRequest, jest.fn(), 100); + setSocketTimeout(clientRequest, vi.fn(), 100); expect(clientRequest.setTimeout).toHaveBeenCalledTimes(1); expect(clientRequest.setTimeout).toHaveBeenLastCalledWith(100, expect.any(Function)); }); it(`sets the request's timeout to 0 if not provided`, () => { - setSocketTimeout(clientRequest, jest.fn()); + setSocketTimeout(clientRequest, vi.fn()); expect(clientRequest.setTimeout).toHaveBeenCalledTimes(1); expect(clientRequest.setTimeout).toHaveBeenLastCalledWith(0, expect.any(Function)); }); it(`destroys the request on timeout`, () => { - setSocketTimeout(clientRequest, jest.fn()); + setSocketTimeout(clientRequest, vi.fn()); expect(clientRequest.destroy).not.toHaveBeenCalled(); // call setTimeout callback @@ -34,7 +34,7 @@ describe("setSocketTimeout", () => { }); it(`rejects on timeout with a TimeoutError`, () => { - const reject = jest.fn(); + const reject = vi.fn(); const timeoutInMs = 100; setSocketTimeout(clientRequest, reject, timeoutInMs); diff --git a/packages/property-provider/src/chain.spec.ts b/packages/property-provider/src/chain.spec.ts index 816e5a45b71..ebf1a071320 100644 --- a/packages/property-provider/src/chain.spec.ts +++ b/packages/property-provider/src/chain.spec.ts @@ -1,9 +1,9 @@ import { chain } from "./chain"; import { ProviderError } from "./ProviderError"; -const resolveStatic = (staticValue: unknown) => jest.fn().mockResolvedValue(staticValue); -const rejectWithError = (errorMsg: string) => jest.fn().mockRejectedValue(new Error(errorMsg)); -const rejectWithProviderError = (errorMsg: string) => jest.fn().mockRejectedValue(new ProviderError(errorMsg)); +const resolveStatic = (staticValue: unknown) => vi.fn().mockResolvedValue(staticValue); +const rejectWithError = (errorMsg: string) => vi.fn().mockRejectedValue(new Error(errorMsg)); +const rejectWithProviderError = (errorMsg: string) => vi.fn().mockRejectedValue(new ProviderError(errorMsg)); describe("chain", () => { it("should distill many credential providers into one", async () => { @@ -90,7 +90,7 @@ describe("chain", () => { const expectedError = new ProviderError("ProviderError with tryNextLink set to false", false); const providers = [ rejectWithProviderError("Move along"), - jest.fn().mockRejectedValue(expectedError), + vi.fn().mockRejectedValue(expectedError), resolveStatic("foo"), ]; diff --git a/packages/property-provider/src/memoize.spec.ts b/packages/property-provider/src/memoize.spec.ts index 904142ec601..f80fc9d3fa6 100644 --- a/packages/property-provider/src/memoize.spec.ts +++ b/packages/property-provider/src/memoize.spec.ts @@ -6,7 +6,7 @@ describe("memoize", () => { const repeatTimes = 10; beforeEach(() => { - provider = jest.fn().mockResolvedValue(mockReturn); + provider = vi.fn().mockResolvedValue(mockReturn); }); afterEach(() => { @@ -72,8 +72,8 @@ describe("memoize", () => { let requiresRefresh: jest.Mock; beforeEach(() => { - isExpired = jest.fn().mockReturnValue(true); - requiresRefresh = jest.fn().mockReturnValue(false); + isExpired = vi.fn().mockReturnValue(true); + requiresRefresh = vi.fn().mockReturnValue(false); }); describe("should not reinvoke the underlying provider while isExpired returns `false`", () => { diff --git a/packages/shared-ini-file-loader/src/getSSOTokenFilepath.spec.ts b/packages/shared-ini-file-loader/src/getSSOTokenFilepath.spec.ts index 3edff44fe41..c1a83f39181 100644 --- a/packages/shared-ini-file-loader/src/getSSOTokenFilepath.spec.ts +++ b/packages/shared-ini-file-loader/src/getSSOTokenFilepath.spec.ts @@ -9,8 +9,8 @@ jest.mock("./getHomeDir"); describe(getSSOTokenFilepath.name, () => { const mockCacheName = "mockCacheName"; - const mockDigest = jest.fn().mockReturnValue(mockCacheName); - const mockUpdate = jest.fn().mockReturnValue({ digest: mockDigest }); + const mockDigest = vi.fn().mockReturnValue(mockCacheName); + const mockUpdate = vi.fn().mockReturnValue({ digest: mockDigest }); const mockHomeDir = "/home/dir"; const mockSsoStartUrl = "mock_sso_start_url"; diff --git a/packages/shared-ini-file-loader/src/getSSOTokenFromFile.spec.ts b/packages/shared-ini-file-loader/src/getSSOTokenFromFile.spec.ts index c6cb3cac0cc..de6326283ab 100644 --- a/packages/shared-ini-file-loader/src/getSSOTokenFromFile.spec.ts +++ b/packages/shared-ini-file-loader/src/getSSOTokenFromFile.spec.ts @@ -4,7 +4,7 @@ import { promises } from "fs"; import { getSSOTokenFilepath } from "./getSSOTokenFilepath"; import { getSSOTokenFromFile } from "./getSSOTokenFromFile"; -jest.mock("fs", () => ({ promises: { readFile: jest.fn() } })); +jest.mock("fs", () => ({ promises: { readFile: vi.fn() } })); jest.mock("./getSSOTokenFilepath"); describe(getSSOTokenFromFile.name, () => { diff --git a/packages/shared-ini-file-loader/src/slurpFile.spec.ts b/packages/shared-ini-file-loader/src/slurpFile.spec.ts index a1e5b87f492..7c928f77fc3 100644 --- a/packages/shared-ini-file-loader/src/slurpFile.spec.ts +++ b/packages/shared-ini-file-loader/src/slurpFile.spec.ts @@ -1,7 +1,7 @@ // ToDo: Change to "fs/promises" when supporting nodejs>=14 import { promises } from "fs"; -jest.mock("fs", () => ({ promises: { readFile: jest.fn() } })); +jest.mock("fs", () => ({ promises: { readFile: vi.fn() } })); describe("slurpFile", () => { const UTF8 = "utf8"; diff --git a/packages/signature-v4/src/credentialDerivation.spec.ts b/packages/signature-v4/src/credentialDerivation.spec.ts index bfeb17c7349..191d25e7dac 100644 --- a/packages/signature-v4/src/credentialDerivation.spec.ts +++ b/packages/signature-v4/src/credentialDerivation.spec.ts @@ -34,7 +34,7 @@ describe("getSigningKey", () => { it("should trap errors encountered while hashing", () => { return expect( getSigningKey( - jest.fn(() => { + vi.fn(() => { throw new Error("PANIC"); }), credentials, @@ -47,7 +47,7 @@ describe("getSigningKey", () => { describe("caching", () => { it("should return the same signing key when called with the same date, region, service, and credentials", async () => { - const mockSha256Constructor = jest.fn().mockImplementation((args) => { + const mockSha256Constructor = vi.fn().mockImplementation((args) => { return new Sha256(args); }); const key1 = await getSigningKey(mockSha256Constructor, credentials, shortDate, region, service); diff --git a/packages/signature-v4/src/getPayloadHash.spec.ts b/packages/signature-v4/src/getPayloadHash.spec.ts index ea25a3aa021..8947c9a0e70 100644 --- a/packages/signature-v4/src/getPayloadHash.spec.ts +++ b/packages/signature-v4/src/getPayloadHash.spec.ts @@ -28,7 +28,7 @@ describe("getPayloadHash", () => { [SHA256_HEADER]: "foo", }, }), - jest.fn(() => { + vi.fn(() => { throw new Error("I should not have been invoked!"); }) ) diff --git a/packages/smithy-client/src/client.spec.ts b/packages/smithy-client/src/client.spec.ts index 56ed3944e00..0e62232ca9c 100644 --- a/packages/smithy-client/src/client.spec.ts +++ b/packages/smithy-client/src/client.spec.ts @@ -2,9 +2,9 @@ import { Client } from "./client"; describe("SmithyClient", () => { // eslint-disable-next-line @typescript-eslint/no-unused-vars - const mockHandler = jest.fn((args: any) => Promise.resolve({ output: "foo" })); + const mockHandler = vi.fn((args: any) => Promise.resolve({ output: "foo" })); // eslint-disable-next-line @typescript-eslint/no-unused-vars - const mockResolveMiddleware = jest.fn((args) => mockHandler); + const mockResolveMiddleware = vi.fn((args) => mockHandler); // eslint-disable-next-line @typescript-eslint/no-unused-vars const getCommandWithOutput = (output: string) => ({ resolveMiddleware: mockResolveMiddleware, @@ -31,7 +31,7 @@ describe("SmithyClient", () => { }); it("should apply callback when command and callback is supplied", (done) => { - const callback = jest.fn((err, response) => { + const callback = vi.fn((err, response) => { expect(response).toEqual("foo"); done(); }); @@ -39,7 +39,7 @@ describe("SmithyClient", () => { }); it("should apply callback when command, options and callback is supplied", (done) => { - const callback = jest.fn((err, response) => { + const callback = vi.fn((err, response) => { expect(response).toEqual("foo"); expect(mockResolveMiddleware.mock.calls.length).toEqual(1); expect(mockResolveMiddleware.mock.calls[0][2 as any]).toEqual(options); diff --git a/packages/smithy-client/src/create-aggregated-client.spec.ts b/packages/smithy-client/src/create-aggregated-client.spec.ts index b0ea19c6eae..6bcba36d9c1 100644 --- a/packages/smithy-client/src/create-aggregated-client.spec.ts +++ b/packages/smithy-client/src/create-aggregated-client.spec.ts @@ -1,7 +1,7 @@ import { createAggregatedClient } from "./create-aggregated-client"; class BaseClient { - send = jest.fn() as any; + send = vi.fn() as any; } class AggregatedClient extends BaseClient { constructor(commands) { @@ -14,7 +14,7 @@ class UserClient extends AggregatedClient {} describe(createAggregatedClient.name, () => { it("extends its base client", async () => { const commands = { - ActionCommand: jest.fn(), + ActionCommand: vi.fn(), }; const aggregatedClient: any = new AggregatedClient(commands); @@ -25,7 +25,7 @@ describe(createAggregatedClient.name, () => { it("is extensible", async () => { const commands = { - ActionCommand: jest.fn(), + ActionCommand: vi.fn(), }; const aggregatedClient: any = new UserClient(commands); @@ -37,7 +37,7 @@ describe(createAggregatedClient.name, () => { it("should dispatch using the command lookup", async () => { const commands = { - ActionCommand: jest.fn(), + ActionCommand: vi.fn(), }; const aggregatedClient: any = new AggregatedClient(commands); @@ -49,7 +49,7 @@ describe(createAggregatedClient.name, () => { it("should call send with the matching command", async () => { const commands = { - ActionCommand: jest.fn(), + ActionCommand: vi.fn(), }; const aggregatedClient: any = new AggregatedClient(commands); diff --git a/packages/smithy-client/src/emitWarningIfUnsupportedVersion.spec.ts b/packages/smithy-client/src/emitWarningIfUnsupportedVersion.spec.ts index 6d228d49e24..65714d2aa1e 100644 --- a/packages/smithy-client/src/emitWarningIfUnsupportedVersion.spec.ts +++ b/packages/smithy-client/src/emitWarningIfUnsupportedVersion.spec.ts @@ -31,7 +31,7 @@ describe.skip("emitWarningIfUnsupportedVersion", () => { [getPreviousMajorVersion(major), 0, 0], ].map((arr) => `v${arr.join(".")}`) )(`%s`, async (unsupportedVersion) => { - process.emitWarning = jest.fn(); + process.emitWarning = vi.fn(); emitWarningIfUnsupportedVersion(unsupportedVersion); // Verify that the warning was emitted. @@ -54,7 +54,7 @@ describe.skip("emitWarningIfUnsupportedVersion", () => { [major + 1, 0, 0], ].map((arr) => `v${arr.join(".")}`) )(`%s`, async (unsupportedVersion) => { - process.emitWarning = jest.fn(); + process.emitWarning = vi.fn(); emitWarningIfUnsupportedVersion(unsupportedVersion); expect(process.emitWarning).not.toHaveBeenCalled(); }); diff --git a/packages/util-defaults-mode-node/src/resolveDefaultsModeConfig.spec.ts b/packages/util-defaults-mode-node/src/resolveDefaultsModeConfig.spec.ts index d0570c6bafe..1f8c3a9b7b9 100644 --- a/packages/util-defaults-mode-node/src/resolveDefaultsModeConfig.spec.ts +++ b/packages/util-defaults-mode-node/src/resolveDefaultsModeConfig.spec.ts @@ -40,7 +40,7 @@ describe("resolveDefaultsModeConfig", () => { }); it("should memoize the response", async () => { - const providerMock = jest.fn().mockResolvedValue("legacy"); + const providerMock = vi.fn().mockResolvedValue("legacy"); const defaultsMode = resolveDefaultsModeConfig({ defaultsMode: providerMock }); await defaultsMode(); const mockInvokeCount = providerMock.mock.calls.length; diff --git a/packages/util-endpoints/src/resolveEndpoint.spec.ts b/packages/util-endpoints/src/resolveEndpoint.spec.ts index 6f17139d478..47d5c7e64e7 100644 --- a/packages/util-endpoints/src/resolveEndpoint.spec.ts +++ b/packages/util-endpoints/src/resolveEndpoint.spec.ts @@ -116,10 +116,10 @@ describe(resolveEndpoint.name, () => { it("should debug proper infos", () => { const { paramWithDefaultKey: ignored, ...endpointParamsWithoutDefault } = mockEndpointParams; const mockLogger = { - debug: jest.fn(), - info: jest.fn(), - warn: jest.fn(), - error: jest.fn(), + debug: vi.fn(), + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), }; const resolvedEndpoint = resolveEndpoint(mockRuleSetObject, { diff --git a/packages/util-endpoints/src/utils/callFunction.spec.ts b/packages/util-endpoints/src/utils/callFunction.spec.ts index 2bd03a8e1b4..cbc0542b97e 100644 --- a/packages/util-endpoints/src/utils/callFunction.spec.ts +++ b/packages/util-endpoints/src/utils/callFunction.spec.ts @@ -32,7 +32,7 @@ describe(callFunction.name, () => { "subsgtring", "urlEncode", ])("calls built-in endpoint function %s", (builtIn) => { - endpointFunctions[builtIn] = jest.fn().mockReturnValue(mockReturn); + endpointFunctions[builtIn] = vi.fn().mockReturnValue(mockReturn); const mockArg = "mockArg"; const mockFn = { fn: builtIn, argv: [mockArg] }; @@ -67,7 +67,7 @@ describe(callFunction.name, () => { ); it("calls custom endpoint functions", () => { - const mockCustomFunction = jest.fn().mockReturnValue(mockReturn); + const mockCustomFunction = vi.fn().mockReturnValue(mockReturn); customEndpointFunctions["ns"] = { mockCustomFunction, }; diff --git a/packages/util-endpoints/src/utils/evaluateCondition.spec.ts b/packages/util-endpoints/src/utils/evaluateCondition.spec.ts index 6d6c0ebe9af..2c21500a87f 100644 --- a/packages/util-endpoints/src/utils/evaluateCondition.spec.ts +++ b/packages/util-endpoints/src/utils/evaluateCondition.spec.ts @@ -33,10 +33,10 @@ describe(evaluateCondition.name, () => { ])("returns %s for", (result, testCases) => { it.each(testCases)(`value: '%s'`, (mockReturn) => { const mockLogger = { - debug: jest.fn(), - info: jest.fn(), - warn: jest.fn(), - error: jest.fn(), + debug: vi.fn(), + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), }; (callFunction as jest.Mock).mockReturnValue(mockReturn); const { result, toAssign } = evaluateCondition(mockFnArgs, { ...mockOptions, logger: mockLogger }); @@ -53,10 +53,10 @@ describe(evaluateCondition.name, () => { it("returns assigned value if defined", () => { const mockAssignedValue = "mockAssignedValue"; const mockLogger = { - debug: jest.fn(), - info: jest.fn(), - warn: jest.fn(), - error: jest.fn(), + debug: vi.fn(), + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), }; (callFunction as jest.Mock).mockReturnValue(mockAssignedValue); const { result, toAssign } = evaluateCondition( diff --git a/packages/util-endpoints/src/utils/evaluateConditions.spec.ts b/packages/util-endpoints/src/utils/evaluateConditions.spec.ts index 154af48495d..108ac1298f4 100644 --- a/packages/util-endpoints/src/utils/evaluateConditions.spec.ts +++ b/packages/util-endpoints/src/utils/evaluateConditions.spec.ts @@ -7,10 +7,10 @@ jest.mock("./evaluateCondition"); describe(evaluateConditions.name, () => { const mockLogger = { - debug: jest.fn(), - info: jest.fn(), - warn: jest.fn(), - error: jest.fn(), + debug: vi.fn(), + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), }; const mockOptions: EvaluateOptions = { endpointParams: {}, diff --git a/packages/util-endpoints/src/utils/evaluateEndpointRule.spec.ts b/packages/util-endpoints/src/utils/evaluateEndpointRule.spec.ts index 3fa011831a9..916ffbc4e1f 100644 --- a/packages/util-endpoints/src/utils/evaluateEndpointRule.spec.ts +++ b/packages/util-endpoints/src/utils/evaluateEndpointRule.spec.ts @@ -15,10 +15,10 @@ jest.mock("./getEndpointProperties"); describe(evaluateEndpointRule.name, () => { const mockLogger = { - debug: jest.fn(), - info: jest.fn(), - warn: jest.fn(), - error: jest.fn(), + debug: vi.fn(), + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), }; const mockOptions: EvaluateOptions = { endpointParams: {}, diff --git a/packages/util-retry/src/AdaptiveRetryStrategy.spec.ts b/packages/util-retry/src/AdaptiveRetryStrategy.spec.ts index 16449a35b8a..1d665abb5b4 100644 --- a/packages/util-retry/src/AdaptiveRetryStrategy.spec.ts +++ b/packages/util-retry/src/AdaptiveRetryStrategy.spec.ts @@ -10,11 +10,11 @@ jest.mock("./StandardRetryStrategy"); jest.mock("./DefaultRateLimiter"); describe(AdaptiveRetryStrategy.name, () => { - const maxAttemptsProvider = jest.fn(); + const maxAttemptsProvider = vi.fn(); const retryTokenScope = "scope"; const mockDefaultRateLimiter = { - getSendToken: jest.fn(), - updateClientSendingRate: jest.fn(), + getSendToken: vi.fn(), + updateClientSendingRate: vi.fn(), }; const mockRetryToken: StandardRetryToken = { getRetryCost: () => 1, diff --git a/packages/util-retry/src/StandardRetryStrategy.spec.ts b/packages/util-retry/src/StandardRetryStrategy.spec.ts index 3ccb144828f..68b8a59ce49 100644 --- a/packages/util-retry/src/StandardRetryStrategy.spec.ts +++ b/packages/util-retry/src/StandardRetryStrategy.spec.ts @@ -53,8 +53,8 @@ describe(StandardRetryStrategy.name, () => { describe("refreshRetryTokenForRetry", () => { it("refreshes the token", async () => { - const getRetryCount = jest.fn().mockReturnValue(0); - const hasRetryTokens = jest.fn().mockReturnValue(true); + const getRetryCount = vi.fn().mockReturnValue(0); + const hasRetryTokens = vi.fn().mockReturnValue(true); const mockRetryToken = { getRetryCount, hasRetryTokens, diff --git a/packages/util-retry/src/defaultRetryBackoffStrategy.spec.ts b/packages/util-retry/src/defaultRetryBackoffStrategy.spec.ts index dc0af34aed9..9b2d4c5034a 100644 --- a/packages/util-retry/src/defaultRetryBackoffStrategy.spec.ts +++ b/packages/util-retry/src/defaultRetryBackoffStrategy.spec.ts @@ -5,7 +5,7 @@ describe("defaultRetryBackoffStrategy", () => { const mathDotRandom = Math.random; beforeEach(() => { - Math.random = jest.fn().mockReturnValue(1); + Math.random = vi.fn().mockReturnValue(1); }); afterEach(() => { @@ -59,7 +59,7 @@ describe("defaultRetryBackoffStrategy", () => { const expectedDelay = Math.floor(mockRandomValue * 2 ** attempts * delayBase); retryBackoffStrategy.setDelayBase(delayBase); it(`(${delayBase}, ${attempts}) with mock Math.random=${mockRandomValue} returns ${expectedDelay}`, () => { - Math.random = jest.fn().mockReturnValue(mockRandomValue); + Math.random = vi.fn().mockReturnValue(mockRandomValue); expect(retryBackoffStrategy.computeNextBackoffDelay(attempts)).toBe(expectedDelay); }); }); diff --git a/packages/util-stream-browser/src/sdk-stream-mixin.spec.ts b/packages/util-stream-browser/src/sdk-stream-mixin.spec.ts index 9dc1e25f9ec..7240e39c740 100644 --- a/packages/util-stream-browser/src/sdk-stream-mixin.spec.ts +++ b/packages/util-stream-browser/src/sdk-stream-mixin.spec.ts @@ -39,7 +39,7 @@ describe(sdkStreamMixin.name, () => { }; let originalReadableStreamCtr = global.ReadableStream; - const mockReadableStream = jest.fn(); + const mockReadableStream = vi.fn(); class ReadableStream { constructor() { mockReadableStream(); @@ -92,8 +92,8 @@ describe(sdkStreamMixin.name, () => { describe("transformToString", () => { let originalTextDecoder = global.TextDecoder; - const mockDecode = jest.fn(); - global.TextDecoder = jest.fn().mockImplementation(function () { + const mockDecode = vi.fn(); + global.TextDecoder = vi.fn().mockImplementation(function () { return { decode: mockDecode }; }); @@ -168,8 +168,8 @@ describe(sdkStreamMixin.name, () => { describe("transformToWebStream with Blob payload", () => { let originalBlobCtr = global.Blob; - const mockBlob = jest.fn(); - const mockBlobStream = jest.fn(); + const mockBlob = vi.fn(); + const mockBlobStream = vi.fn(); class Blob { constructor() { mockBlob(); diff --git a/packages/util-stream-node/src/getAwsChunkedEncodingStream.spec.ts b/packages/util-stream-node/src/getAwsChunkedEncodingStream.spec.ts index d593a5db742..947446f10d4 100644 --- a/packages/util-stream-node/src/getAwsChunkedEncodingStream.spec.ts +++ b/packages/util-stream-node/src/getAwsChunkedEncodingStream.spec.ts @@ -3,11 +3,11 @@ import { Readable } from "stream"; import { getAwsChunkedEncodingStream } from "./getAwsChunkedEncodingStream"; describe(getAwsChunkedEncodingStream.name, () => { - const mockBase64Encoder = jest.fn(); - const mockBodyLengthChecker = jest.fn(); - const mockChecksumAlgorithmFn = jest.fn(); + const mockBase64Encoder = vi.fn(); + const mockBodyLengthChecker = vi.fn(); + const mockChecksumAlgorithmFn = vi.fn(); const mockChecksumLocationName = "mockChecksumLocationName"; - const mockStreamHasher = jest.fn(); + const mockStreamHasher = vi.fn(); const mockOptions = { base64Encoder: mockBase64Encoder, diff --git a/packages/util-stream-node/src/sdk-stream-mixin.spec.ts b/packages/util-stream-node/src/sdk-stream-mixin.spec.ts index 654a9c664b2..f3b72891afc 100644 --- a/packages/util-stream-node/src/sdk-stream-mixin.spec.ts +++ b/packages/util-stream-node/src/sdk-stream-mixin.spec.ts @@ -67,7 +67,7 @@ describe(sdkStreamMixin.name, () => { }); describe("transformToString", () => { - const toStringMock = jest.fn(); + const toStringMock = vi.fn(); beforeAll(() => { jest.resetAllMocks(); }); @@ -97,7 +97,7 @@ describe(sdkStreamMixin.name, () => { jest.spyOn(util, "TextDecoder").mockImplementation( () => ({ - decode: jest.fn(), + decode: vi.fn(), }) as any ); (fromArrayBuffer as jest.Mock).mockReturnValue({ toString: toStringMock }); @@ -156,7 +156,7 @@ describe(sdkStreamMixin.name, () => { const originalToWebImpl = Readable.toWeb; beforeAll(() => { // @ts-expect-error - Readable.toWeb = jest.fn().mockReturnValue("A web stream"); + Readable.toWeb = vi.fn().mockReturnValue("A web stream"); }); afterAll(() => { diff --git a/packages/util-stream/src/getAwsChunkedEncodingStream.spec.ts b/packages/util-stream/src/getAwsChunkedEncodingStream.spec.ts index d593a5db742..947446f10d4 100644 --- a/packages/util-stream/src/getAwsChunkedEncodingStream.spec.ts +++ b/packages/util-stream/src/getAwsChunkedEncodingStream.spec.ts @@ -3,11 +3,11 @@ import { Readable } from "stream"; import { getAwsChunkedEncodingStream } from "./getAwsChunkedEncodingStream"; describe(getAwsChunkedEncodingStream.name, () => { - const mockBase64Encoder = jest.fn(); - const mockBodyLengthChecker = jest.fn(); - const mockChecksumAlgorithmFn = jest.fn(); + const mockBase64Encoder = vi.fn(); + const mockBodyLengthChecker = vi.fn(); + const mockChecksumAlgorithmFn = vi.fn(); const mockChecksumLocationName = "mockChecksumLocationName"; - const mockStreamHasher = jest.fn(); + const mockStreamHasher = vi.fn(); const mockOptions = { base64Encoder: mockBase64Encoder, diff --git a/packages/util-stream/src/sdk-stream-mixin.browser.spec.ts b/packages/util-stream/src/sdk-stream-mixin.browser.spec.ts index f3d7b896f01..60a707efb9b 100644 --- a/packages/util-stream/src/sdk-stream-mixin.browser.spec.ts +++ b/packages/util-stream/src/sdk-stream-mixin.browser.spec.ts @@ -33,7 +33,7 @@ describe(sdkStreamMixin.name, () => { }; let originalReadableStreamCtr = global.ReadableStream; - const mockReadableStream = jest.fn(); + const mockReadableStream = vi.fn(); class ReadableStream { constructor() { mockReadableStream(); @@ -86,8 +86,8 @@ describe(sdkStreamMixin.name, () => { describe("transformToString", () => { let originalTextDecoder = global.TextDecoder; - const mockDecode = jest.fn(); - global.TextDecoder = jest.fn().mockImplementation(function () { + const mockDecode = vi.fn(); + global.TextDecoder = vi.fn().mockImplementation(function () { return { decode: mockDecode }; }); @@ -162,8 +162,8 @@ describe(sdkStreamMixin.name, () => { describe("transformToWebStream with Blob payload", () => { let originalBlobCtr = global.Blob; - const mockBlob = jest.fn(); - const mockBlobStream = jest.fn(); + const mockBlob = vi.fn(); + const mockBlobStream = vi.fn(); class Blob { constructor() { mockBlob(); diff --git a/packages/util-stream/src/sdk-stream-mixin.spec.ts b/packages/util-stream/src/sdk-stream-mixin.spec.ts index f5900baf630..df73d1ea5c7 100644 --- a/packages/util-stream/src/sdk-stream-mixin.spec.ts +++ b/packages/util-stream/src/sdk-stream-mixin.spec.ts @@ -82,7 +82,7 @@ describe(sdkStreamMixin.name, () => { }); describe("transformToString", () => { - const toStringMock = jest.fn(); + const toStringMock = vi.fn(); beforeAll(() => { jest.resetAllMocks(); }); @@ -112,7 +112,7 @@ describe(sdkStreamMixin.name, () => { jest.spyOn(util, "TextDecoder").mockImplementation( () => ({ - decode: jest.fn(), + decode: vi.fn(), }) as any ); (fromArrayBuffer as jest.Mock).mockReturnValue({ toString: toStringMock }); @@ -171,7 +171,7 @@ describe(sdkStreamMixin.name, () => { const originalToWebImpl = Readable.toWeb; beforeAll(() => { // @ts-expect-error - Readable.toWeb = jest.fn().mockReturnValue("A web stream"); + Readable.toWeb = vi.fn().mockReturnValue("A web stream"); }); afterAll(() => { diff --git a/packages/util-utf8/src/fromUtf8.browser.spec.ts b/packages/util-utf8/src/fromUtf8.browser.spec.ts index 4d97df92610..6761b005af7 100644 --- a/packages/util-utf8/src/fromUtf8.browser.spec.ts +++ b/packages/util-utf8/src/fromUtf8.browser.spec.ts @@ -8,8 +8,8 @@ declare const global: any; describe("fromUtf8", () => { it("should use the Encoding API", () => { const expected = new Uint8Array(0); - const encode = jest.fn().mockReturnValue(expected); - (global as any).TextEncoder = jest.fn(() => ({ encode })); + const encode = vi.fn().mockReturnValue(expected); + (global as any).TextEncoder = vi.fn(() => ({ encode })); expect(fromUtf8("ABC")).toBe(expected); }); diff --git a/packages/util-utf8/src/toUtf8.browser.spec.ts b/packages/util-utf8/src/toUtf8.browser.spec.ts index c5d82b0f5b4..d1c4bbac4d2 100644 --- a/packages/util-utf8/src/toUtf8.browser.spec.ts +++ b/packages/util-utf8/src/toUtf8.browser.spec.ts @@ -10,8 +10,8 @@ declare const global: any; describe("toUtf8", () => { it("should use the Encoding API", () => { const expected = "ABC"; - const decode = jest.fn().mockReturnValue(expected); - (global as any).TextDecoder = jest.fn(() => ({ decode })); + const decode = vi.fn().mockReturnValue(expected); + (global as any).TextDecoder = vi.fn(() => ({ decode })); expect(toUtf8(new Uint8Array(0))).toBe(expected); }); diff --git a/packages/util-waiter/src/createWaiter.spec.ts b/packages/util-waiter/src/createWaiter.spec.ts index 3061d99673c..fa127153400 100644 --- a/packages/util-waiter/src/createWaiter.spec.ts +++ b/packages/util-waiter/src/createWaiter.spec.ts @@ -2,7 +2,7 @@ import { AbortController } from "@smithy/abort-controller"; import { WaiterOptions, WaiterState } from "./waiter"; -const mockValidate = jest.fn(); +const mockValidate = vi.fn(); jest.mock("./utils/validate", () => ({ validateWaiterOptions: mockValidate, })); @@ -41,7 +41,7 @@ describe("createWaiter", () => { it("should abort when abortController is signalled", async () => { const abortController = new AbortController(); - const mockAcceptorChecks = jest.fn().mockResolvedValue(retryState); + const mockAcceptorChecks = vi.fn().mockResolvedValue(retryState); const statusPromise = createWaiter( { ...minimalWaiterConfig, @@ -57,7 +57,7 @@ describe("createWaiter", () => { }); it("should success when acceptor checker returns seccess", async () => { - const mockAcceptorChecks = jest.fn().mockResolvedValue(successState); + const mockAcceptorChecks = vi.fn().mockResolvedValue(successState); const statusPromise = createWaiter( { ...minimalWaiterConfig, @@ -71,7 +71,7 @@ describe("createWaiter", () => { }); it("should fail when acceptor checker returns failure", async () => { - const mockAcceptorChecks = jest.fn().mockResolvedValue(failureState); + const mockAcceptorChecks = vi.fn().mockResolvedValue(failureState); const statusPromise = createWaiter( { ...minimalWaiterConfig, diff --git a/packages/util-waiter/src/poller.spec.ts b/packages/util-waiter/src/poller.spec.ts index 8a93e5083fd..b7f3391c55e 100644 --- a/packages/util-waiter/src/poller.spec.ts +++ b/packages/util-waiter/src/poller.spec.ts @@ -50,7 +50,7 @@ describe(runPolling.name, () => { }); it("should returns state and reason in case of failure", async () => { - mockAcceptorChecks = jest.fn().mockResolvedValueOnce(failureState); + mockAcceptorChecks = vi.fn().mockResolvedValueOnce(failureState); await expect(runPolling(config, input, mockAcceptorChecks)).resolves.toStrictEqual(failureState); expect(mockAcceptorChecks).toHaveBeenCalled(); @@ -60,7 +60,7 @@ describe(runPolling.name, () => { }); it("returns state and reason in case of success", async () => { - mockAcceptorChecks = jest.fn().mockResolvedValueOnce(successState); + mockAcceptorChecks = vi.fn().mockResolvedValueOnce(successState); await expect(runPolling(config, input, mockAcceptorChecks)).resolves.toStrictEqual(successState); expect(mockAcceptorChecks).toHaveBeenCalled(); expect(mockAcceptorChecks).toHaveBeenCalledTimes(1); @@ -112,7 +112,7 @@ describe(runPolling.name, () => { maxWaitTime: 5, }; - mockAcceptorChecks = jest.fn().mockResolvedValue(retryState); + mockAcceptorChecks = vi.fn().mockResolvedValue(retryState); await expect(runPolling(localConfig, input, mockAcceptorChecks)).resolves.toStrictEqual(timeoutState); expect(sleep).toHaveBeenCalled(); expect(sleep).toHaveBeenCalledTimes(2); @@ -126,7 +126,7 @@ describe(runPolling.name, () => { abortController, }; - mockAcceptorChecks = jest.fn().mockResolvedValue(retryState); + mockAcceptorChecks = vi.fn().mockResolvedValue(retryState); abortController.abort(); await expect(runPolling(localConfig, input, mockAcceptorChecks)).resolves.toStrictEqual(abortedState); expect(sleep).not.toHaveBeenCalled();