fix(core): Handle trailing slashes when generating route names (#142)

Netflix · Nov 26, 2018 · 19147f7 · 19147f7
1 parent 79e04b8
commit 19147f7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/packages/@pollyjs/core/src/server/index.js b/packages/@pollyjs/core/src/server/index.js
@@ -2,8 +2,6 @@ import RouteRecognizer from 'route-recognizer';
 import castArray from 'lodash-es/castArray';
 import { URL, assert, timeout, buildUrl } from '@pollyjs/utils';
 
-import removeHostFromUrl from '../utils/remove-host-from-url';
-
 import Route from './route';
 import Handler from './handler';
 import Middleware from './middleware';
@@ -25,15 +23,15 @@ const METHODS = ['GET', 'PUT', 'POST', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'];
 const { keys } = Object;
 
 function parseUrl(url) {
-  const path = new URL(url);
+  const parsedUrl = new URL(url);
   /*
     Use the full origin (http://hostname:port) if the host exists. If there
     is no host, URL.origin returns "null" (null as a string) so set host to '/'
   */
-  const host = path.host ? path.origin : CHARS.SLASH;
-  const href = removeHostFromUrl(path).href;
+  const host = parsedUrl.host ? parsedUrl.origin : CHARS.SLASH;
+  const path = parsedUrl.pathname || CHARS.SLASH;
 
-  return { host, path: href };
+  return { host, path };
 }
 
 export default class Server {
@@ -178,7 +176,7 @@ export default class Server {
    * @returns {String}
    */
   _nameForPath(path = '') {
-    return path
+    const name = path
       .split(CHARS.SLASH)
       .map(segment => {
         switch (segment.charAt(0)) {
@@ -195,11 +193,12 @@ export default class Server {
         }
       })
       .join(CHARS.SLASH);
+
+    // Remove trailing slash, if we result with an empty string, return a slash
+    return name.replace(/\/$/, '') || CHARS.SLASH;
   }
 
   _registryForHost(host) {
-    host = host || CHARS.SLASH;
-
     if (!this[REGISTRY][host]) {
       this[REGISTRY][host] = METHODS.reduce((acc, method) => {
         acc[method] = new RouteRecognizer();

diff --git a/packages/@pollyjs/core/tests/unit/server/server-test.js b/packages/@pollyjs/core/tests/unit/server/server-test.js
@@ -135,6 +135,28 @@ describe('Unit | Server', function() {
       });
     });
 
+    it('should concat handlers for same paths with a trailing slash', async function() {
+      addHandlers('/ping');
+      expect(server.lookup('GET', '/ping').handlers).to.have.lengthOf(3);
+
+      addHandlers('/ping/');
+      expect(server.lookup('GET', '/ping').handlers).to.have.lengthOf(6);
+      expect(server.lookup('GET', '/ping/').handlers).to.have.lengthOf(6);
+
+      addHandlers('http://ping.com');
+      expect(server.lookup('GET', 'http://ping.com').handlers).to.have.lengthOf(
+        3
+      );
+
+      addHandlers('http://ping.com/');
+      expect(server.lookup('GET', 'http://ping.com').handlers).to.have.lengthOf(
+        6
+      );
+      expect(
+        server.lookup('GET', 'http://ping.com/').handlers
+      ).to.have.lengthOf(6);
+    });
+
     it('should concat handlers for same paths with different dynamic segment names', async function() {
       addHandlers('/ping/:id');
       expect(server.lookup('GET', '/ping/:id').handlers).to.have.lengthOf(3);