simplify fake route creation

wheresrhys · Aug 15, 2020 · e8de01c · e8de01c
1 parent e85f5c0
commit e8de01c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Route/index.js b/src/Route/index.js
@@ -11,15 +11,13 @@ const isUrlMatcher = (matcher) =>
 const isFunctionMatcher = (matcher) => typeof matcher === 'function';
 
 class Route {
-	constructor(args, fetchMock, skipValidation = false) {
+	constructor(args, fetchMock) {
 		this.fetchMock = fetchMock;
 		const debug = getDebug('compileRoute()');
 		debug('Compiling route');
 		this.init(args);
 		this.sanitize();
-		if (!skipValidation) {
-			this.validate();
-		}
+		this.validate();
 		this.generateMatcher();
 		this.limit();
 		this.delayResponse();

diff --git a/src/lib/inspecting.js b/src/lib/inspecting.js
@@ -6,10 +6,10 @@ const isName = (nameOrMatcher) =>
 	typeof nameOrMatcher === 'string' && /^[\da-zA-Z\-]+$/.test(nameOrMatcher);
 
 const filterCallsWithMatcher = function (matcher, options = {}, calls) {
-	({ matcher } = new Route([Object.assign({ matcher }, options)], this, true));
-	// this.generateMatcher(
-	// 	this.sanitizeRoute()
-	// );
+	({ matcher } = new Route(
+		[Object.assign({ matcher, response: 'ok' }, options)],
+		this
+	));
 	return calls.filter(({ url, options }) =>
 		matcher(normalizeUrl(url), options)
 	);