feat: match URL params by path-to-regexp

linearlabs-workspace · Jun 14, 2022 · 56fc6d1 · 56fc6d1
1 parent b8698c3
commit 56fc6d1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/utils/faker.js b/src/utils/faker.js
@@ -75,15 +75,16 @@ export class Faker {
     };
 
     matchMock = (url, method = 'GET') => {
-        const { path } = getNormalizedUrl(url);
+        const { fullUrl } = getNormalizedUrl(url);
 
         for (let key in this.requestMap) {
             const { url: requestUrl, method: requestMethod } =
                 this.requestMap[key];
-            const { path: requestPath } =
+            const { fullUrlEscaped } =
                 getNormalizedUrl(requestUrl);
+
             if (
-                match(requestPath)(path) &&
+                match(fullUrlEscaped)(fullUrl) &&
                 method == requestMethod &&
                 !this.requestMap[key].skip
             ) {

diff --git a/src/utils/faker.test.js b/src/utils/faker.test.js
@@ -65,6 +65,13 @@ describe('Faker', () => {
                 response: {},
                 delay: 0,
             },
+            {
+                url: 'http://request.com?a=1&b=2',
+                method: 'GET',
+                status: 200,
+                response: {},
+                delay: 0,
+            },
         ];
         faker.makeInitialRequestMap(requests);
 
@@ -84,6 +91,12 @@ describe('Faker', () => {
             expect(actual.method).toEqual(requests[2].method);
             expect(actual.skip).toEqual(false);
         });
+        it('should return request if url matches with the query parameters', () => {
+            const actual = faker.matchMock('http://request.com?a=1&b=2', 'GET');
+            expect(actual.url).toEqual(requests[3].url);
+            expect(actual.method).toEqual(requests[3].method);
+            expect(actual.skip).toEqual(false);
+        });
     });
 
     describe('restore', () => {

diff --git a/src/utils/url.js b/src/utils/url.js
@@ -14,8 +14,13 @@ export const getNormalizedUrl = (rawUrl = '') => {
             searchParamKeys.push(key);
         }
     }
+
+    const searchEscaped = url.search ? '\\' + url.search : '';
+
     return {
         path: url.host + url.pathname,
         searchParamKeys,
+        fullUrl: url.host + url.pathname + url.search,
+        fullUrlEscaped: url.host + url.pathname + searchEscaped,
     };
 };