Merge pull request #869 from wheresrhys/rhys/contains

Rhys/contains

docs/docs/API/route/matcher.md

@@ -50,6 +50,12 @@ Match a url beginning with a string, e.g. `"begin:http://www.site.com"`
 
 Match a url ending with a string, e.g. `"end:.jpg"`
 
+### include:...
+
+`{String}`
+
+Match a url including a string, e.g. `"include:site.com/api"`
+
 ### path:...
 
 `{String}`

packages/fetch-mock/src/Matchers.ts

@@ -9,6 +9,7 @@ import { normalizeHeaders, getPath, normalizeUrl } from './RequestUtils.js';
 export type URLMatcherObject = {
 	begin?: string;
 	end?: string;
+	include?: string;
 	glob?: string;
 	express?: string;
 	path?: string;
@@ -41,11 +42,15 @@ const stringMatchers: { [key: string]: UrlMatcherGenerator } = {
 	begin:
 		(targetString) =>
 		({ url }) =>
-			url.indexOf(targetString) === 0,
+			url.startsWith(targetString),
 	end:
 		(targetString) =>
 		({ url }) =>
-			url.substr(-targetString.length) === targetString,
+			url.endsWith(targetString),
+	include:
+		(targetString) =>
+		({ url }) =>
+			url.includes(targetString),
 
 	glob: (targetString) => {
 		const urlRX = glob(targetString);

packages/fetch-mock/src/__tests__/Matchers/url.test.js

@@ -47,6 +47,19 @@ describe('url matching', () => {
 		expect(route.matcher({ url: 'http://b.com/path' })).toBe(true);
 	});
 
+	it('match include: keyword', () => {
+		const route = new Route({
+			url: 'include:m/p',
+			response: 200,
+		});
+
+		expect(route.matcher({ url: 'http://a.com/path' })).toBe(true);
+		expect(route.matcher({ url: 'http://a.com/ram/path' })).toBe(true);
+		expect(route.matcher({ url: 'http://a.com/p' })).toBe(true);
+		expect(route.matcher({ url: 'http://a.com/P' })).toBe(false);
+		expect(route.matcher({ url: 'http://a.com/ramp' })).toBe(false);
+	});
+
 	it('match glob: keyword', () => {
 		const route = new Route({ url: 'glob:/its/*/*', response: 200 });
 		expect(route.matcher({ url: '/its/alive' })).toBe(false);