Merge pull request #900 from wheresrhys/rhys/issue-899

Rhys/issue 899

Author: wheresrhys

packages/fetch-mock/src/FetchMock.ts

@@ -162,12 +162,18 @@ export class FetchMock {
 		matcher?: RouteMatcher | UserRouteConfig,
 		name?: RouteName,
 	): FetchMock {
+		const boundFetch = this.config.fetch.bind(globalThis);
 		if (matcher) {
-			//@ts-expect-error TODO findo out how to overload an overload
-			this.route(matcher, ({ args }) => this.config.fetch(...args), name);
+			this.route(
+				// @ts-expect-error related to the overloading of .route()
+				matcher,
+				// @ts-expect-error this is just args from a fetch call being passed into a bound fetch - no idea why the error
+				({ args }) => boundFetch(...args),
+				name,
+			);
 		} else {
-			//@ts-expect-error TODO findo out how to overload an overload
-			this.catch(({ args }) => this.config.fetch(...args));
+			// @ts-expect-error this is just args from a fetch call being passed into a bound fetch - no idea why the error
+			this.catch(({ args }) => boundFetch(...args));
 		}
 
 		return this;

packages/fetch-mock/src/__tests__/FetchMock/mock-and-spy.test.js

@@ -59,6 +59,7 @@ describe('mock and spy', () => {
 	describe('.spy()', () => {
 		testChainableMethod('spy');
 		testChainableMethod('spyGlobal');
+
 		it('passes all requests through to the network by default', async () => {
 			vi.spyOn(fm.config, 'fetch');
 			fm.spy();
@@ -134,5 +135,13 @@ describe('mock and spy', () => {
 				method: 'post',
 			});
 		});
+
+		it('can call actual native fetch without erroring', async () => {
+			fm.spyGlobal();
+			const isBrowser = Boolean(globalThis.location);
+			// avoids getting caught by a cors error
+			const testUrl = isBrowser ? '/' : 'http://example.com/';
+			await expect(fm.fetchHandler(testUrl)).resolves.toBeInstanceOf(Response);
+		});
 	});
 });